dropbear: clean up default PATH handling in makefile
Harmonise handling of DEFAULT_PATH by removing the patch introducing #ifndef guards around the path, and only using one means to set the path in the makefile. Signed-off-by: Dario Ernst <Dario.Ernst@riverbed.com>
This commit is contained in:
parent
132b88ea39
commit
866b7bad00
@ -77,13 +77,13 @@ CONFIGURE_ARGS += \
|
|||||||
--disable-zlib \
|
--disable-zlib \
|
||||||
--enable-bundled-libtom
|
--enable-bundled-libtom
|
||||||
|
|
||||||
TARGET_CFLAGS += -DDEFAULT_PATH=\\\"$(CONFIG_TARGET_INIT_PATH)\\\" -DARGTYPE=3 -ffunction-sections -fdata-sections
|
TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
|
||||||
TARGET_LDFLAGS += -Wl,--gc-sections
|
TARGET_LDFLAGS += -Wl,--gc-sections
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(Build/Configure/Default)
|
$(Build/Configure/Default)
|
||||||
|
|
||||||
$(SED) 's,^#define DEFAULT_PATH .*$$$$,#define DEFAULT_PATH "$(CONFIG_TARGET_INIT_PATH)",g' \
|
$(SED) 's,^#define DEFAULT_PATH .*$$$$,#define DEFAULT_PATH "$(TARGET_INIT_PATH)",g' \
|
||||||
$(PKG_BUILD_DIR)/options.h
|
$(PKG_BUILD_DIR)/options.h
|
||||||
|
|
||||||
awk 'BEGIN { rc = 1 } \
|
awk 'BEGIN { rc = 1 } \
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
--- a/options.h
|
|
||||||
+++ b/options.h
|
|
||||||
@@ -352,7 +352,9 @@ be overridden at runtime with -I. 0 disa
|
|
||||||
#define DEFAULT_IDLE_TIMEOUT 0
|
|
||||||
|
|
||||||
/* The default path. This will often get replaced by the shell */
|
|
||||||
+#ifndef DEFAULT_PATH
|
|
||||||
#define DEFAULT_PATH "/usr/bin:/bin"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Some other defines (that mostly should be left alone) are defined
|
|
||||||
* in sysoptions.h */
|
|
Loading…
x
Reference in New Issue
Block a user