summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mdk-stage1/Makefile6
-rw-r--r--mdk-stage1/NEWS1
2 files changed, 5 insertions, 2 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index adcf7c9e1..15453fbd0 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -63,6 +63,8 @@ ifneq (DIETLIBC, $(L))
INIT_DEFS += $(GLIBC_INCLUDES)
endif
+STAGE1_DEFS=-DDISABLE_KA
+
INITOBJS = $(subst .c,.o,$(INITSRC))
@@ -100,7 +102,7 @@ STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c
CDROMSRC = cdrom.c
DISKSRC = disk.c directory.c partition.c
NETWORKSRC = network.c nfsmount.c dhcp.c url.c dns.c adsl.c directory.c wireless.c
-KASRC = ka.c
+#KASRC = ka.c
# use sort to remove duplicates
STAGE1_ALLSRC = $(sort $(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC) $(KASRC))
@@ -188,7 +190,7 @@ $(STAGE1OBJS-NETWORK-STANDALONE): %-NETWORK-STANDALONE.o: %.c
$(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@
$(STAGE1OBJS-FULL): %-FULL.o: %.c
- $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) -DENABLE_BOOTSPLASH -c $< -o $@
+ $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -DENABLE_BOOTSPLASH -c $< -o $@
.c.o:
$(DIET) $(COMPILE) $(INCLUDES) -DENABLE_BOOTSPLASH -c $<
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index e9eaabd8b..ea4509ce3 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,5 +1,6 @@
- do not advice long dead pcmcia.img & network.img images (mga#5466)
- first attempt at supporting XenBlk discs
+- hide "KA server" option (mga#5944)
- switch from gethostbyname() to getaddrinfo() (mga#4056)
- switch from gethostbyaddr() to getnameinfo()