From: John Hodge <tpg@mutabah.net>
Date: Sat, 8 Jun 2013 04:36:56 +0000 (+0800)
Subject: Externals/dropbear - Works, but install might be failing
X-Git-Tag: rel0.15~450
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fe53470758da8b50623c8cc07d3dc897edb8ce37;p=tpg%2Facess2.git

Externals/dropbear - Works, but install might be failing

- Dropbear's install attempts a `chown root` but the error is ignored
---

diff --git a/Externals/common.mk b/Externals/common.mk
index e74b4942..7a86c40e 100644
--- a/Externals/common.mk
+++ b/Externals/common.mk
@@ -15,9 +15,11 @@ else
  $(error No BFD translation for $(ARCH) in Externals/common.mk)
 endif
 
-PREFIX=$(ACESSDIR)/Externals/Output/common
-EPREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
-SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(ARCH)
+#PREFIX=$(ACESSDIR)/Externals/Output
+#EPREFIX=$(ACESSDIR)/Externals/Output/$(BFD)
+PREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
+EPREFIX=$(PREFIX)
+SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(BFD)
 HOST=$(BFD)-acess_proxy-elf
 
 #
@@ -61,18 +63,18 @@ else
 endif
 SDIR := ../$(DIR)
 
-CONFIGURE_LINE ?= ./configure --host=$(HOST) --prefx=$(PREFIX) --eprefix=$(EPREFIX) $(CONFIGURE_ARGS)
+CONFIGURE_LINE ?= $(SDIR)/configure --host=$(HOST) --prefix=$(PREFIX) --exec-prefix=$(EPREFIX) $(CONFIGURE_ARGS)
 
 .PHONY: all clean install _patch _build
 
+install: all
+	cd $(BDIR) && make $(ITARGETS)
+
 all: $(DIR) _patch _build
 
 clean:
 	rm -rf $(DIR) $(BDIR)
 
-install: all
-	cd $(BDIR) && make $(ITARGETS)
-
 $(DIR): $(ARCHIVE)
 	tar -xf $(ARCHIVE)
 
diff --git a/Externals/dropbear/Makefile b/Externals/dropbear/Makefile
index f53193d6..3aeb8379 100644
--- a/Externals/dropbear/Makefile
+++ b/Externals/dropbear/Makefile
@@ -4,11 +4,13 @@
 #
 
 DEPS := zlib
-TARBALL_PATTERN := dropbear-*.tar.gz
-TARBALL_TO_DIR_L := %.tar.gz
+TARBALL_PATTERN := dropbear-*.tar.bz2
+TARBALL_TO_DIR_L := %.tar.bz2
 TARBALL_TO_DIR_R := %
 PATCHES := options.h
-CONFIGURE_ARGS = --with-zlib=../../Output/$(ARCH) --disable-utmp --disable-wtmp --disable-lastlog
+CONFIGURE_ARGS = --with-zlib=$(PREFIX) --disable-utmp --disable-wtmp --disable-lastlog
+BTARGETS = dbclient
+ITARGETS = inst_dbclient
 
 include ../common.mk
 
diff --git a/Externals/dropbear/patches/options.h.patch b/Externals/dropbear/patches/options.h.patch
index 111cdcd9..a0c5379a 100644
--- a/Externals/dropbear/patches/options.h.patch
+++ b/Externals/dropbear/patches/options.h.patch
@@ -1,6 +1,6 @@
 --- options.h
 +++ options.h
-@@ -217,1 +217,1 @@
+@@ -217,2 +217,2 @@
   * rsa/dss key generation */
 -#define DROPBEAR_URANDOM_DEV "/dev/urandom"
 +#define DROPBEAR_URANDOM_DEV "/Devices/frandom"