Commit eb651a12 authored by Ryan Jackson's avatar Ryan Jackson

Make 64-bit Linux MFS compile again

parent 3e5c1f25
MFS_ARCH = i386
MFS_ARCH = x86_64
SOURCE_PATH = $(PWD)/source
TARGET_PATH = $(PWD)/target
TARGET_BUILD_PATH = $(PWD)/build
......
--- linux-2.6.25/net/ipv4/Kconfig 2008-08-29 09:50:50.000000000 -0600
+++ linux-2.6.25-emulab/net/ipv4/Kconfig 2008-08-29 09:53:39.000000000 -0600
@@ -632,5 +632,11 @@
@@ -627,3 +627,9 @@
If unsure, say N.
......@@ -10,8 +10,6 @@
+config ICMP_PINGOFDEATH
+ bool "ICMP: ICMP Ping-of-Death (Emulab)"
+
source "net/ipv4/ipvs/Kconfig"
--- linux-2.6.25/net/ipv4/icmp.c 2008-08-29 09:51:02.000000000 -0600
+++ linux-2.6.25-emulab/net/ipv4/icmp.c 2008-08-29 09:57:02.000000000 -0600
@@ -973,6 +973,67 @@
......@@ -71,7 +69,7 @@
+ sysctl_ipod_enabled = 0;
+ printk(KERN_CRIT "IPOD: reboot forced by %u.%u.%u.%u...\n",
+ NIPQUAD(iph->saddr));
+ machine_restart(NULL);
+ emergency_restart();
+ } else {
+ printk(KERN_WARNING "IPOD: from %u.%u.%u.%u rejected\n",
+ NIPQUAD(iph->saddr));
......
......@@ -45,8 +45,8 @@ $(OPENSSL_PATH)/.config-stamp: $(OPENSSL_PATH)/.patch-stamp
(cd $(OPENSSL_PATH); \
CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 $(TARGET_CFLAGS)" \
PATH=$(STAGING_DIR)/usr/bin:$(PATH) \
MACHINE=i386 \
./config 386 --prefix=/usr \
MACHINE=$(MFS_ARCH) \
./config --prefix=/usr \
--openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
-I$(STAGING_DIR)/usr/include $(OPENSSL_OPTS) threads \
shared no-idea no-mdc2 no-rc5)
......@@ -63,7 +63,7 @@ $(OPENSSL_PATH)/apps/openssl: $(OPENSSL_PATH)/.config-stamp
$(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_PATH)/apps/openssl
PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) \
CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr \
CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR) \
-C $(OPENSSL_PATH) install
cp -fa $(OPENSSL_PATH)/libcrypto.so* $(STAGING_DIR)/usr/lib/
chmod a-x $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.8
......
......@@ -61,6 +61,7 @@ $(TCSH_PATH)/.config-stamp: $(TCSH_PATH)/.patch-stamp
$(TCSH_PATH)/tcsh: $(TCSH_PATH)/.config-stamp
PATH=$(STAGING_DIR)/usr/bin:$(PATH) \
CC=$(TARGET_CC) \
STAGING_DIR=$(STAGING_DIR) \
$(MAKE) -C $(TCSH_PATH) \
$(TARGET_CONFIGURE_OPTS) LD=$(MFS_ARCH)-linux-uclibc-gcc
touch $@
......
......@@ -147,3 +147,18 @@ diff -ur tcsh-6.14.00.orig/configure tcsh-6.14.00/configure
-
-
-
diff -ur tcsh-6.14.00.orig/Makefile.in tcsh-6.14.00/Makefile.in
--- tcsh-6.14.00/Makefile.in 2010-09-04 19:32:52.000000000 -0600
+++ tcsh-6.14.00/Makefile.in 2010-09-04 19:33:23.000000000 -0600
@@ -364,7 +364,7 @@
tc.defs.c: gethost host.defs
@rm -f $@
@echo "/* Do not edit this file, make creates it */" > $@
- ./gethost $(srcdir)/host.defs >> $@
+ LD_LIBRARY_PATH=$(STAGING_DIR)/lib:$(STAGING_DIR)/usr/lib ./gethost $(srcdir)/host.defs >> $@
tcsh.ps: tcsh.man
rm -f tcsh.ps
MFS_ARCH = i386
MFS_ARCH = x86_64
TOPDIR = $(PWD)
SOURCE_PATH = $(TOPDIR)/source
SCRIPTS_PATH = $(TOPDIR)/scripts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment