Commit 6d0b0135 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 8ad3ba0b e15bac56
......@@ -13,7 +13,8 @@ INITRAMFS = $(BOOT_PATH)/initramfs.gz
#FAKEROOT_BIN = $(STAGING_DIR)/usr/bin/fakeroot
FAKEROOT_BIN = fakeroot
MODULES := busybox zlib linux dropbear testbed hdparm target_template sudo e2fsprogs openssl wget perl portmap file ethtool
MODULES := busybox zlib linux dropbear testbed hdparm target_template sudo \
e2fsprogs openssl wget perl portmap file ethtool ncurses jove tcsh
#MODULES := busybox zlib linux dropbear testbed hdparm target_template sudo e2fsprogs openssl wget portmap file
INSTALL_MODULES := $(addsuffix -install,$(MODULES))
EXTRACT_MODULES := $(addsuffix -extract,$(MODULES) toolchain)
......@@ -38,10 +39,14 @@ clean:
rm -rf $(TARGET_BUILD_PATH)
rm -rf $(BOOT_PATH)
toolchain:
$(MAKE) -C $(SOURCE_PATH)/$@ all
toolchain: $(BUILDROOT_PATH)/toolchain-built
$(BUILDROOT_PATH)/toolchain-built:
$(MAKE) -C $(SOURCE_PATH)/toolchain all
$(MAKE) -C $(SOURCE_PATH)/zlib install-sysroot
$(MAKE) -C $(SOURCE_PATH)/openssl install
$(MAKE) -C $(SOURCE_PATH)/ncurses install
touch $(BUILDROOT_PATH)/toolchain-built
$(MODULES): toolchain
$(MAKE) -C $(SOURCE_PATH)/$@ all
......@@ -70,18 +75,6 @@ uclibc-install: $(TARGET_PATH)/lib/libc.so.0
$(FAKEROOT_ENVIRONMENT):
touch $@
devices: $(FAKEROOT_ENVIRONMENT)
rm -rf $(TARGET_PATH)/dev
$(FAKEROOT_BIN) -s $(FAKEROOT_ENVIRONMENT) \
-i $(FAKEROOT_ENVIRONMENT) \
$(SCRIPTS_PATH)/makedevs.sh \
$(SCRIPTS_PATH)/devices $(TARGET_PATH)
permissions: $(FAKEROOT_ENVIRONMENT) devices install
$(FAKEROOT_BIN) -s $(FAKEROOT_ENVIRONMENT) \
-i $(FAKEROOT_ENVIRONMENT) \
$(SCRIPTS_PATH)/fixperms.sh $(TARGET_PATH)
initramfs: install
rm -rf $(INITRAMFS_PATH)
cp -dpR $(TARGET_PATH) $(INITRAMFS_PATH)
......@@ -94,6 +87,9 @@ initramfs: install
$(FAKEROOT_BIN) -s $(FAKEROOT_ENVIRONMENT) \
-i $(FAKEROOT_ENVIRONMENT) \
$(SCRIPTS_PATH)/fixperms.sh $(INITRAMFS_PATH)
$(FAKEROOT_BIN) -s $(FAKEROOT_ENVIRONMENT) \
-i $(FAKEROOT_ENVIRONMENT) \
$(SCRIPTS_PATH)/misc_fixup.sh $(TARGET_PATH)
$(FAKEROOT_BIN) -i $(FAKEROOT_ENVIRONMENT) \
$(SCRIPTS_PATH)/gen_initramfs.sh $(INITRAMFS_PATH) $(INITRAMFS)
rm -f $(FAKEROOT_ENVIRONMENT)
......
#! /bin/sh
target_dir="$1"
if [ -z "$target_dir" ] || ! [ -d "$target_dir" ]; then
echo "${0##*/}: invalid target directory \"$target_dir\""
exit 1
fi
if ! [ -f "$target_dir/bin/tcsh" ]; then
ln -sf /bin/tcsh.fake "$target_dir/bin/tcsh"
ln -sf /bin/tcsh.fake "$target_dir/bin/csh"
fi
......@@ -23,7 +23,7 @@ clean:
LIBS := $(addprefix $(TARGET_PATH)/lib/, libext2fs.so libe2p.so libcom_err.so libblkid.so libuuid.so)
install: $(TARGET_PATH)/sbin/mke2fs $(TARGET_PATH)/sbin/tune2fs $(TARGET_PATH)/sbin/e2fsck $(TARGET_PATH)/usr/bin/uuidgen $(LIBS)
install: $(TARGET_PATH)/sbin/mke2fs $(TARGET_PATH)/sbin/tune2fs $(TARGET_PATH)/sbin/e2fsck $(TARGET_PATH)/usr/bin/uuidgen $(TARGET_PATH)/usr/sbin/resize2fs $(LIBS)
$(E2FSPROGS_PATH)/.extract-stamp:
mkdir -p $(TARGET_BUILD_PATH)
......@@ -60,7 +60,7 @@ $(E2FSPROGS_PATH)/.config-stamp: $(E2FSPROGS_PATH)/.patch-stamp
--infodir=/usr/share/info \
--disable-debugfs --disable-imager \
--disable-tls \
--disable-resizer --enable-fsck \
--enable-fsck \
--disable-e2initrd-helper \
--enable-elf-shlibs \
--without-catgets \
......@@ -91,6 +91,11 @@ $(E2FSPROGS_PATH)/misc/uuidgen: $(E2FSPROGS_PATH)/.config-stamp
$(TARGET_CONFIGURE_OPTS) LD=$(MFS_ARCH)-linux-uclibc-gcc
touch $@
$(E2FSPROGS_PATH)/resize/resize2fs: $(E2FSPROGS_PATH)/.config-stamp
LDFLAGS="-rpath ../lib" PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) -C $(E2FSPROGS_PATH) \
$(TARGET_CONFIGURE_OPTS) LD=$(MFS_ARCH)-linux-uclibc-gcc
touch $@
$(E2FSPROGS_PATH)/lib/%.so: $(E2FSPROGS_PATH)/.config-stamp
LDFLAGS="-rpath ../lib" PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) -C $(E2FSPROGS_PATH) \
$(TARGET_CONFIGURE_OPTS) LD=$(MFS_ARCH)-linux-uclibc-gcc
......@@ -119,6 +124,13 @@ $(TARGET_PATH)/sbin/e2fsck: $(E2FSPROGS_PATH)/e2fsck/e2fsck
ln -sf $(notdir $@) $(dir $@)/fsck.ext3
touch -c $@
$(TARGET_PATH)/usr/sbin/resize2fs: $(E2FSPROGS_PATH)/resize/resize2fs
install -d -m 755 $(TARGET_PATH)/sbin
install -m 755 $< \
$(TARGET_PATH)/usr/sbin/resize2fs
$(STRIPCMD) --strip-unneeded $(TARGET_PATH)/usr/sbin/resize2fs
touch -c $@
$(TARGET_PATH)/sbin/tune2fs: $(E2FSPROGS_PATH)/misc/tune2fs
install -d -m 755 $(TARGET_PATH)/sbin
install -m 755 $(E2FSPROGS_PATH)/misc/tune2fs \
......
include ../../variables.mk
JOVE_VERSION = 4.16.0.72
JOVE_PATH = $(TARGET_BUILD_PATH)/jove$(JOVE_VERSION)
.PHONY: extract patch config \
jove install clean all
all: jove
extract: $(JOVE_PATH)/.extract-stamp
patch: $(JOVE_PATH)/.patch-stamp
config: $(JOVE_PATH)/.config-stamp
jove: $(JOVE_PATH)/jjove
install: $(TARGET_PATH)/usr/bin/jove
clean:
PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) -C $(JOVE_PATH) clean
rm -f $(JOVE_PATH)/.build-stamp $(JOVE_PATH)/.config-stamp
$(JOVE_PATH)/.extract-stamp:
mkdir -p $(TARGET_BUILD_PATH)
cd $(TARGET_BUILD_PATH); tar xzf $(TARBALL_PATH)/jove-$(JOVE_VERSION).tar.gz
touch $@
$(JOVE_PATH)/.patch-stamp: $(JOVE_PATH)/.extract-stamp
$(SCRIPTS_PATH)/patch-kernel.sh $(JOVE_PATH) $(SOURCE_PATH)/jove '*.patch'
touch $@
$(JOVE_PATH)/.config-stamp: $(JOVE_PATH)/.patch-stamp
cp $(SOURCE_PATH)/jove/jove.mk $(JOVE_PATH)/Makefile
touch $@
#--enable-elf-shlibs --enable-dynamic-e2fsck --disable-swapfs \
#--enable-elf-shlibs \
$(JOVE_PATH)/jjove: $(JOVE_PATH)/.config-stamp
PATH=$(STAGING_DIR)/usr/bin:$(PATH) \
CC=$(TARGET_CC) \
$(MAKE) -C $(JOVE_PATH) \
$(TARGET_CONFIGURE_OPTS) LD=$(MFS_ARCH)-linux-uclibc-gcc \
jjove
touch $@
$(TARGET_PATH)/usr/bin/jove: $(JOVE_PATH)/jjove
install -d -m 755 $(TARGET_PATH)/usr
install -d -m 755 $(TARGET_PATH)/usr/bin
install -m 755 $< $@
$(STRIPCMD) --strip-unneeded $@
touch -c $@
This diff is collapsed.
diff -ur jove4.16.0.72.orig/insert.c jove4.16.0.72/insert.c
--- jove4.16.0.72.orig/insert.c 2002-03-20 14:49:38.000000000 -0700
+++ jove4.16.0.72/insert.c 2010-07-21 11:58:51.000000000 -0600
@@ -504,7 +504,7 @@
atchar = 0;
}
- getline(atline->l_dline, genbuf);
+ jove_getline(atline->l_dline, genbuf);
atchar += tchar;
linecopy(genbuf, atchar, save);
atline->l_dline = putline(genbuf);
diff -ur jove4.16.0.72.orig/io.c jove4.16.0.72/io.c
--- jove4.16.0.72.orig/io.c 2010-04-15 23:41:46.000000000 -0600
+++ jove4.16.0.72/io.c 2010-07-21 11:58:51.000000000 -0600
@@ -1356,9 +1356,9 @@
void
#ifdef USE_PROTOTYPES
-getline proto((daddr addr, register char *buf))
+jove_getline proto((daddr addr, register char *buf))
#else
-getline(addr, buf)
+jove_getline(addr, buf)
daddr addr;
register char *buf;
#endif
diff -ur jove4.16.0.72.orig/io.h jove4.16.0.72/io.h
--- jove4.16.0.72.orig/io.h 2002-03-20 14:49:38.000000000 -0700
+++ jove4.16.0.72/io.h 2010-07-21 11:58:51.000000000 -0600
@@ -40,7 +40,7 @@
close_file proto((File *fp)),
d_cache_init proto((void)),
file_write proto((char *fname, bool app)),
- getline proto((daddr addr, char *buf)),
+ jove_getline proto((daddr addr, char *buf)),
lsave proto((void)),
putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
read_file proto((char *file, bool is_insert)),
diff -ur jove4.16.0.72.orig/recover.c jove4.16.0.72/recover.c
--- jove4.16.0.72.orig/recover.c 2010-05-16 19:53:38.000000000 -0600
+++ jove4.16.0.72/recover.c 2010-07-21 11:58:51.000000000 -0600
@@ -166,7 +166,7 @@
private char *getblock proto((daddr atl));
void
-getline(tl, buf)
+jove_getline(tl, buf)
daddr tl;
char *buf;
{
@@ -597,7 +597,7 @@
Nchars = Nlines = 0L;
while (--nlines >= 0) {
addr = getaddr(ptrs_fp);
- getline(addr, buf);
+ jove_getline(addr, buf);
Nlines += 1;
Nchars += 1 + strlen(buf);
fputs(buf, out);
diff -ur jove4.16.0.72.orig/temp.h jove4.16.0.72/temp.h
--- jove4.16.0.72.orig/temp.h 2002-03-20 14:49:39.000000000 -0700
+++ jove4.16.0.72/temp.h 2010-07-21 11:58:51.000000000 -0600
@@ -12,7 +12,7 @@
* Yank and Kill are really easy; basically all we do is make copies
* of the disk addresses of the lines (as opposed to the contents).
* So, putline(char *buf) writes buf to the disk and returns a new
- * disk address. getline(daddr addr, char *buf) is the opposite of
+ * disk address. jove_getline(daddr addr, char *buf) is the opposite of
* putline(). f_getputl(LinePtr line, File fp) reads from open fp
* directly into the tmp file (into the buffer cache (see below))
* and stores the address in line. This is used during read_file to
diff -ur jove4.16.0.72.orig/util.c jove4.16.0.72/util.c
--- jove4.16.0.72.orig/util.c 2004-02-01 12:38:29.000000000 -0700
+++ jove4.16.0.72/util.c 2010-07-21 11:58:51.000000000 -0600
@@ -280,7 +280,7 @@
strcpy(buf, linebuf);
Jr_Len = strlen(linebuf);
} else
- getline(line->l_dline, buf);
+ jove_getline(line->l_dline, buf);
return buf;
}
diff -ur jove4.16.0.72.orig/util.h jove4.16.0.72/util.h
--- jove4.16.0.72.orig/util.h 2004-02-01 12:38:29.000000000 -0700
+++ jove4.16.0.72/util.h 2010-07-21 11:58:51.000000000 -0600
@@ -18,7 +18,7 @@
#define eobp() (lastp(curline) && eolp())
#define eolp() (linebuf[curchar] == '\0')
#define firstp(line) ((line) == curbuf->b_first)
-#define getDOT() getline(curline->l_dline, linebuf)
+#define getDOT() jove_getline(curline->l_dline, linebuf)
#define lastp(line) ((line) == curbuf->b_last)
extern UnivPtr
include ../../variables.mk
NCURSES_VERSION = 5.7+20100313
NCURSES_PATH = $(TARGET_BUILD_PATH)/ncurses-$(NCURSES_VERSION)
.PHONY: extract patch config \
ncurses install clean all
all: ncurses
extract: $(NCURSES_PATH)/.extract-stamp
patch: $(NCURSES_PATH)/.patch-stamp
config: $(NCURSES_PATH)/.config-stamp
ncurses: $(NCURSES_PATH)/lib/libncurses.a
install: $(STAGING_DIR)/lib/libncurses.a $(TARGET_PATH)/lib/libncurses.so.5.7
clean:
PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) -C $(NCURSES_PATH) clean
rm -f $(NCURSES_PATH)/.build-stamp $(NCURSES_PATH)/.config-stamp
$(NCURSES_PATH)/.extract-stamp:
mkdir -p $(TARGET_BUILD_PATH)
cd $(TARGET_BUILD_PATH); tar xzf $(TARBALL_PATH)/ncurses-$(NCURSES_VERSION).tar.gz
touch $@
$(NCURSES_PATH)/.patch-stamp: $(NCURSES_PATH)/.extract-stamp
$(SCRIPTS_PATH)/patch-kernel.sh $(NCURSES_PATH) $(SOURCE_PATH)/ncurses '*.patch'
touch $@
$(NCURSES_PATH)/.config-stamp: $(NCURSES_PATH)/.patch-stamp
rm -f $(NCURSES_PATH)/config.cache
(cd $(NCURSES_PATH); \
CC=$(TARGET_CC) \
PATH=$(STAGING_DIR)/usr/bin:$(PATH) \
$(HOST_CONFIGURE_OPTS) \
./configure \
--target=$(MFS_ARCH)-linux-uclibc \
--host=$(MFS_ARCH)-linux-uclibc \
--build=$(MFS_ARCH)-linux-gnu \
--prefix=$(STAGING_DIR) \
--exec-prefix=/usr \
--bindir=/usr/bin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
--datadir=/usr/share \
--with-shared \
--without-gpm \
--without-cxx \
--without-manpages \
--without-progs \
--without-cxx-binding \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
)
touch $@
#--enable-elf-shlibs --enable-dynamic-e2fsck --disable-swapfs \
#--enable-elf-shlibs \
$(NCURSES_PATH)/lib/libncurses.a: $(NCURSES_PATH)/.config-stamp
PATH=$(STAGING_DIR)/usr/bin:$(PATH) \
CC=$(TARGET_CC) \
CXX=$(TARGET_CC) \
$(MAKE) -C $(NCURSES_PATH) \
$(TARGET_CONFIGURE_OPTS)
$(TARGET_PATH)/lib/libncurses.so.5.7: $(STAGING_DIR)/lib/libncurses.so.5.7
mkdir -p $(TARGET_PATH)/usr/share/terminfo
mkdir -p $(TARGET_PATH)/usr/share/terminfo/l
mkdir -p $(TARGET_PATH)/usr/share/terminfo/v
mkdir -p $(TARGET_PATH)/usr/share/terminfo/s
mkdir -p $(TARGET_PATH)/usr/share/terminfo/x
mkdir -p $(TARGET_PATH)/usr/share/tabset
cp -fa $(STAGING_DIR)/usr/share/tabset/* $(TARGET_PATH)/usr/share/tabset
cp -fa $(STAGING_DIR)/usr/share/terminfo/v/vt{100,220} \
$(TARGET_PATH)/usr/share/terminfo/v
cp -fa $(STAGING_DIR)/usr/share/terminfo/l/linux \
$(TARGET_PATH)/usr/share/terminfo/l
cp -fa $(STAGING_DIR)/usr/share/terminfo/s/screen* \
$(TARGET_PATH)/usr/share/terminfo/s
cp -fa $(STAGING_DIR)/usr/share/terminfo/x/xterm \
$(TARGET_PATH)/usr/share/terminfo/x
mkdir -p $(TARGET_PATH)/lib
cp -fa $(STAGING_DIR)/lib/libncurses*.so* $(TARGET_PATH)/lib
$(STRIPCMD) $@
touch -c $@
$(STAGING_DIR)/lib/libncurses.a: $(NCURSES_PATH)/lib/libncurses.a
$(MAKE) -C $(NCURSES_PATH)/include install
(cd $(NCURSES_PATH)/misc; \
prefix=$(STAGING_DIR) \
exec_prefix=/usr \
bindir=/usr/bin \
top_srcdir=.. \
srcdir=. \
datadir=/usr/share \
ticdir=$(STAGING_DIR)/usr/share/terminfo \
source=terminfo.tmp \
cross_compiling=yes \
/bin/sh ./run_tic.sh)
mkdir -p $(STAGING_DIR)/usr/share/tabset
(cd $(NCURSES_PATH)/misc/tabset; \
/bin/sh -c 'for i in * ; do \
if test -f $$i ; then \
echo installing $$i; \
/usr/bin/install -c -m 644 $$i $(STAGING_DIR)/usr/share/tabset/$$i; \
fi; done' \
)
cp -dp $(NCURSES_PATH)/lib/lib* $(STAGING_DIR)/lib
......@@ -3,11 +3,11 @@ include ../../variables.mk
.PHONY: extract patch config \
openssl install clean all
OPENSSL_VERSION = 0.9.7m
OPENSSL_VERSION = 0.9.8n
OPENSSL_PATH = $(TARGET_BUILD_PATH)/openssl-$(OPENSSL_VERSION)
SYSROOT_OPENSSL_SHARED = $(STAGING_DIR)/usr/lib/libcrypto.a
TARGET_OPENSSL_SHARED = $(TARGET_PATH)/usr/lib/libcrypto.so.0.9.7
TARGET_OPENSSL_SHARED = $(TARGET_PATH)/usr/lib/libcrypto.so.0.9.8
all: openssl
......@@ -45,10 +45,12 @@ $(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) \
./Configure linux-$(MFS_ARCH) --prefix=/ \
--openssldir=/lib/ssl -L$(STAGING_DIR)/lib -ldl \
MACHINE=i386 \
./config 386 --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)
PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) CC=$(MFS_ARCH)-linux-uclibc-gcc -C $(OPENSSL_PATH) depend
touch $@
$(OPENSSL_PATH)/apps/openssl: $(OPENSSL_PATH)/.config-stamp
......@@ -64,26 +66,28 @@ $(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_PATH)/apps/openssl
CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr \
-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.7
chmod a-x $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.8
(cd $(STAGING_DIR)/usr/lib; \
ln -fs libcrypto.so.0.9.7 libcrypto.so; \
ln -fs libcrypto.so.0.9.7 libcrypto.so.0; \
ln -fs libcrypto.so.0.9.8 libcrypto.so; \
ln -fs libcrypto.so.0.9.8 libcrypto.so.0; \
)
cp -fa $(OPENSSL_PATH)/libssl.so* $(STAGING_DIR)/usr/lib/
chmod a-x $(STAGING_DIR)/usr/lib/libssl.so.0.9.7
chmod a-x $(STAGING_DIR)/usr/lib/libssl.so.0.9.8
(cd $(STAGING_DIR)/usr/lib; \
ln -fs libssl.so.0.9.7 libssl.so; \
ln -fs libssl.so.0.9.7 libssl.so.0; \
ln -fs libssl.so.0.9.8 libssl.so; \
ln -fs libssl.so.0.9.8 libssl.so.0; \
)
touch -c $@
$(TARGET_PATH)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/usr/lib/libcrypto.a
$(TARGET_PATH)/usr/lib/libcrypto.so.0.9.8: $(STAGING_DIR)/usr/lib/libcrypto.a
mkdir -p $(TARGET_PATH)/usr/lib
mkdir -p $(TARGET_PATH)/usr/lib/ssl
mkdir -p $(TARGET_PATH)/usr/lib/engines
cp -fa $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_PATH)/usr/lib/
cp -fa $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_PATH)/usr/lib/
#cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_PATH)/bin/
$(STRIPCMD) $(TARGET_PATH)/usr/lib/libssl.so.0.9.7
$(STRIPCMD) $(TARGET_PATH)/usr/lib/libcrypto.so.0.9.7
$(STRIPCMD) $(TARGET_PATH)/usr/lib/libssl.so.0.9.8
$(STRIPCMD) $(TARGET_PATH)/usr/lib/libcrypto.so.0.9.8
$(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/usr/lib/libcrypto.a
mkdir -p $(TARGET_DIR)/usr/include
......
diff -ruN openssl-0.9.7m.orig/Configure openssl-0.9.7m/Configure
--- openssl-0.9.7m.orig/Configure 2007-02-22 17:30:49.000000000 -0500
+++ openssl-0.9.7m/Configure 2007-07-23 21:10:15.000000000 -0400
@@ -1,4 +1,4 @@
-:
+#!/usr/bin/perl
eval 'exec perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
##
@@ -390,6 +390,41 @@
# assembler versions -- currently defunct:
##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
+# Sane Linux configuration values, stolen from the Debian package....
+"linux-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+#"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
+"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-cris", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
# bn86-elf.o file file since it is hand tweaked assembler.
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -437,6 +472,7 @@
# ARM comes in both little- and big-endian flavors. The following line is
# endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
"linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# SCO/Caldera targets.
#
diff -ruN openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S
--- openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S 2003-05-29 18:22:34.000000000 -0400
+++ openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S 2007-07-23 21:09:34.000000000 -0400
@@ -74,14 +74,14 @@
#define Dval R8
#if defined(MD5_BLOCK_DATA_ORDER)
-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
# define LOAD lda
# define X(i) [%i1+i*4]%asi
# define md5_block md5_block_asm_data_order_aligned
# define ASI_PRIMARY_LITTLE 0x88
-# else
+/*# else
# error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
-# endif
+# endif*/
#else
# define LOAD ld
# define X(i) [%i1+i*4]
diff -ruN openssl-0.9.7m.orig/include/openssl/opensslconf.h openssl-0.9.7m/include/openssl/opensslconf.h
--- openssl-0.9.7m.orig/include/openssl/opensslconf.h 2007-02-23 07:52:32.000000000 -0500
+++ openssl-0.9.7m/include/openssl/opensslconf.h 2007-07-23 21:09:34.000000000 -0400
@@ -4,17 +4,38 @@
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
+#ifndef OPENSSL_NO_MDC2
+# define OPENSSL_NO_MDC2
+#endif
+#ifndef OPENSSL_NO_RC5
+# define OPENSSL_NO_RC5
+#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
+# define NO_IDEA
+# endif
+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
+# define NO_MDC2
+# endif
+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
+# define NO_RC5
+# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
@@ -27,7 +48,7 @@
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/local/ssl/lib/engines"
-#define OPENSSLDIR "/usr/local/ssl"
+#define ENGINESDIR "/usr/lib/ssl/engines"
+#define OPENSSLDIR "/usr/lib/ssl"
#endif
#endif
......
include ../../variables.mk
TCSH_VERSION = 6.14.00
TCSH_PATH = $(TARGET_BUILD_PATH)/tcsh-$(TCSH_VERSION)
.PHONY: extract patch config \
tcsh install clean all
all: tcsh
extract: $(TCSH_PATH)/.extract-stamp
patch: $(TCSH_PATH)/.patch-stamp
config: $(TCSH_PATH)/.config-stamp
tcsh: $(TCSH_PATH)/tcsh
install: $(TARGET_PATH)/bin/tcsh
clean:
PATH=$(STAGING_DIR)/usr/bin:$(PATH) $(MAKE) -C $(TCSH_PATH) clean
rm -f $(TCSH_PATH)/.build-stamp $(TCSH_PATH)/.config-stamp
$(TCSH_PATH)/.extract-stamp:
mkdir -p $(TARGET_BUILD_PATH)