frodovdr/satip-axe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "fix new dropbear build"

Browse Source 
This reverts commit 3ee63f168e.
This commit is contained in:
Jaroslav Kysela 2018-10-17 17:34:13 +02:00
parent 9a60791649
commit 7078b99048
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -463,8 +463,6 @@ apps/$(DROPBEAR)/configure:
tar -C apps -xjf apps/$(DROPBEAR).tar.bz2 tar -C apps -xjf apps/$(DROPBEAR).tar.bz2
apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure
@echo "#define DEFAULT_PATH \"/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin\"" \
> apps/$(DROPBEAR)/localoptions.h
cd apps/$(DROPBEAR) && \ cd apps/$(DROPBEAR) && \
CC=$(TOOLCHAIN)/bin/sh4-linux-gcc \ CC=$(TOOLCHAIN)/bin/sh4-linux-gcc \
./configure \ ./configure \
@ -475,6 +473,9 @@ apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure
--disable-utmpx \ --disable-utmpx \
--disable-wtmp \ --disable-wtmp \
--disable-wtmpx --disable-wtmpx
sed -e 's/DEFAULT_PATH \"\/usr\/bin:\/bin\"/DEFAULT_PATH \"\/sbin:\/usr\/sbin:\/bin:\/usr\/bin:\/usr\/local\/bin\"/g' \
< apps/$(DROPBEAR)/options.h > apps/$(DROPBEAR)/options.h.2
mv apps/$(DROPBEAR)/options.h.2 apps/$(DROPBEAR)/options.h
make -C apps/$(DROPBEAR) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" make -C apps/$(DROPBEAR) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
.PHONY: dropbear .PHONY: dropbear

2
fs-add/etc/init.d/dropbear
View File

@ -24,4 +24,4 @@ if test -r /etc/sysconfig/authorized_keys ; then
cp /etc/sysconfig/authorized_keys $HOME/.ssh/authorized_keys cp /etc/sysconfig/authorized_keys $HOME/.ssh/authorized_keys
chmod 0600 $HOME/.ssh/authorized_keys chmod 0600 $HOME/.ssh/authorized_keys
fi fi
exec dropbear -F -b /etc/motd exec dropbear -F