From 726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Mar 2011 23:09:42 +0100 Subject: [PATCH] fix bit rot in scripts/Makefile.IMA Signed-off-by: Denys Vlasenko --- loginutils/getty.c | 4 ++-- scripts/Makefile.IMA | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/loginutils/getty.c b/loginutils/getty.c index 3f20c8e81..dfa15b3da 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -87,7 +87,7 @@ struct globals { const char *login; /* login program */ const char *fakehost; const char *tty; /* name of tty */ - const char *initstring; /* modem init string */ + char *initstring; /* modem init string */ const char *issue; /* alternative issue file */ int numspeed; /* number of baud rates to try */ int speeds[MAX_SPEED]; /* baud rates to be tried */ @@ -176,7 +176,7 @@ static void parse_args(char **argv) if (flags & F_INITSTRING) { G.initstring = xstrdup(G.initstring); /* decode \ddd octal codes into chars */ - strcpy_and_process_escape_sequences((char*)G.initstring, G.initstring); + strcpy_and_process_escape_sequences(G.initstring, G.initstring); } argv += optind; debug("after getopt\n"); diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA index a62618ae0..fcb8e5049 100644 --- a/scripts/Makefile.IMA +++ b/scripts/Makefile.IMA @@ -9,7 +9,10 @@ objtree := $(CURDIR) src := $(srctree) obj := $(objtree) -# Look for make include files relative to root of kernel src +# Make generated files +DUMMY := $(shell $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) >&2) + +# Look for make include files relative to root of src MAKEFLAGS += --include-dir=$(srctree) default: busybox @@ -121,6 +124,9 @@ lib-y:= include miscutils/Kbuild lib-all-y += $(patsubst %,miscutils/%,$(sort $(lib-y))) lib-y:= +include mailutils/Kbuild +lib-all-y += $(patsubst %,mailutils/%,$(sort $(lib-y))) +lib-y:= include coreutils/libcoreutils/Kbuild lib-all-y += $(patsubst %,coreutils/libcoreutils/%,$(sort $(lib-y))) lib-y:=