diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 14:21:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 14:21:31 +0100 |
| commit | d65d767c45ebce8001ec1e028fba9d7881b5f847 (patch) | |
| tree | 93d6a8b9f94efaa754619cc54c4dd46d29ed5036 | |
| parent | f9c7b800e7bf803b808cdbefd645a6878d0a101e (diff) | |
| parent | 2e0e960c27afd0218d58157eefc89d5456406035 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
113 files changed, 596988 insertions, 1300 deletions
@@ -97,7 +97,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.12.13" + prompt "3.13.6" boolean depends on ADK_TOOLCHAIN_ONLY @@ -109,8 +109,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_13_5 - prompt "3.13.5" +config ADK_KERNEL_VERSION_3_13_6 + prompt "3.13.6" boolean config ADK_KERNEL_VERSION_3_12_13 @@ -121,6 +121,10 @@ config ADK_KERNEL_VERSION_3_11_10 prompt "3.11.10" boolean +config ADK_KERNEL_VERSION_3_10_30 + prompt "3.10.30" + boolean + config ADK_KERNEL_VERSION_3_4_82 prompt "3.4.82" boolean @@ -129,9 +133,10 @@ endchoice config ADK_KERNEL_VERSION string - default "3.13.5" if ADK_KERNEL_VERSION_3_13_5 + default "3.13.6" if ADK_KERNEL_VERSION_3_13_6 default "3.12.13" if ADK_KERNEL_VERSION_3_12_13 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 + default "3.10.30" if ADK_KERNEL_VERSION_3_10_30 default "3.4.82" if ADK_KERNEL_VERSION_3_4_82 help @@ -1,4 +1,4 @@ -OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org> +OpenADK is Copyright © 2008-2014 Waldemar Brodkorb <wbx@openadk.org> All rights reserved. This licence file covers all of the OpenADK meta distribution @@ -20,11 +20,12 @@ contains tools that are possibly covered by non-GPL-compatible, but OSD/DFSG-compliant, licences. OpenADK is based upon several other projects which are listed -below, in no particular order. If you think you should be li- -sted here but I have forgotten you, please forgive and drop +below, in no particular order. If you think you should be listed +here but I have forgotten you, please forgive and drop me an email. • The FreeWRT Project • The OpenWrt Project -• uClibc Buildroot +• The Buildroot Project +• The Aboriginal Linux Project • The MirOS Project and contributors diff --git a/config/Makefile b/config/Makefile index afe153c8a..9dc08d3ac 100644 --- a/config/Makefile +++ b/config/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk endif CP=cp -fpR -CFLAGS_FOR_BUILD+=-DKBUILD_NO_NLS +CFLAGS_FOR_BUILD:=-DKBUILD_NO_NLS -O2 -w all: ncurses conf mconf @@ -39,36 +39,25 @@ endif endif endif -GTKLIBS = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` - CONF_SRC =conf.c MCONF_SRC =mconf.c $(wildcard lxdialog/*.c) -GCONF_SRC =gconf.c SHARED_SRC=zconf.tab.c SHARED_DEPS:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h CONF_OBJS =$(patsubst %.c,%.o, $(CONF_SRC)) MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC)) -GCONF_OBJS=$(patsubst %.c,%.o, $(GCONF_SRC)) SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC)) conf: $(CONF_OBJS) $(SHARED_OBJS) - @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $^ -o $@ mconf: $(MCONF_OBJS) $(SHARED_OBJS) - @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) - -gconf: $(GCONF_OBJS) $(SHARED_OBJS) - @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(GTKLIBS) + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $^ -o $@ $(LIBS) $(CONF_OBJS): %.o : %.c $(SHARED_DEPS) @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS) - @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(HOSTNCURSES) -I. -c $< -o $@ - -$(GCONF_OBJS): %.o : %.c $(SHARED_DEPS) - @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(GTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@ + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ glob.o: glob.c $(SHARED_DEPS) @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c glob.c -o $@ @@ -94,15 +83,15 @@ lex.%.c: %.l flex -P$(notdir $*) -o$@ $< lex.zconf.o: lex.zconf.c $(SHARED_DEPS) - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS) - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ else lex.zconf.o: lex.zconf.c $(SHARED_DEPS) - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ + @$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@ lex.zconf.c: lex.zconf.c_shipped @$(CP) lex.zconf.c_shipped lex.zconf.c diff --git a/mk/build.mk b/mk/build.mk index 0d36923d2..64719b2df 100644 |