Commit 5a37d92a authored by Ryan Jackson's avatar Ryan Jackson

re-add openssl

parent 4266791f
......@@ -9,7 +9,7 @@ STAGING_DIR = $(PWD)/buildroot/build_i386/staging_dir
INITRAMFS = $(PWD)/initramfs.gz
BOOT_PATH = $(PWD)/boot
MODULES := busybox zlib linux dropbear testbed hdparm target_template
MODULES := busybox zlib linux dropbear testbed hdparm target_template sudo e2fsprogs openssl
INSTALL_MODULES := $(addsuffix -install,$(MODULES))
EXTRACT_MODULES := $(addsuffix -extract,$(MODULES))
PATCH_MODULES := $(addsuffix -patch,$(MODULES))
......
This diff is collapsed.
--- openssl-0.9.7m/apps/speed.c.orig 2008-12-18 11:47:08.000000000 -0700
+++ openssl-0.9.7m/apps/speed.c 2008-12-18 11:46:13.000000000 -0700
@@ -94,7 +94,7 @@
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__UCLIBC__) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
# define TIMEB
#endif
......@@ -9,7 +9,17 @@ LOCKDIR=/var/lock/udhcpc.lock
SUCCESS_FLAG=/var/state/found_controlnet
start() {
local do_frisbee=0
for token in `cat /proc/cmdline`; do
if [ "$token" = "frisbee=yes" ]; then
do_frisbee=1
break
fi
[ $do_frisbee -eq 0 ] && exit 0
done
echo "Starting frisbee..."
/etc/testbed/rc.frisbee
return $rc
......
......@@ -2,7 +2,7 @@ include ../../variables.mk
BUILDROOT := $(PWD)/$(BUILDROOT)
PROGS := imageunzip frisbee growdisk tmcc binoffset groklilo
PROGS := imageunzip imagezip frisbee growdisk tmcc binoffset groklilo
BUILD_TARGETS := $(PROGS)
INSTALL_TARGETS := $(addsuffix -install,$(PROGS))
......@@ -24,7 +24,7 @@ TMCC_OBJ_PATH = $(TARGET_BUILD_PATH)/tmcc
CFLAGS = -Os
INSTALLED_BINS := $(addprefix $(TARGET_PATH)/usr/, \
$(addprefix bin/, binoffset imageunzip tmcc frisbee) \
$(addprefix bin/, binoffset imagezip imageunzip tmcc frisbee) \
$(addprefix sbin/, groklilo growdisk))
all: $(BUILD_TARGETS)
......@@ -61,6 +61,8 @@ script-install:
imageunzip-install: $(TARGET_PATH)/usr/bin/imageunzip
imagezip-install: $(TARGET_PATH)/usr/bin/imagezip
frisbee-install: $(TARGET_PATH)/usr/bin/frisbee
growdisk-install: $(TARGET_PATH)/usr/sbin/growdisk
......@@ -165,8 +167,8 @@ $(TESTBED_BUILD_PATH)/imagezip: $(SYSROOT_ZLIB_SHARED)
$(MAKE) -C $(IMAGEZIP_PATH) -f Makefile-linux.sa \
CC=$(CROSS_COMPILER_PREFIX)gcc \
PATH=$(STAGING_DIR)/usr/bin:$(PATH) imagezip
$(MAKE) -C $(IMAGEZIP_PATH) -f Makefile-linux.sa clean
mkdir -p $(dir $@)
mv $(IMAGEZIP_PATH)/imagnzip $@
mv $(IMAGEZIP_PATH)/imagezip $@
$(MAKE) -C $(IMAGEZIP_PATH) -f Makefile-linux.sa clean
$(STRIPCMD) --strip-unneeded $@
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