re-sync after the big svn loss

1 files changed, 31 insertions, 67 deletions

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 04fe357ff..eebeb3e7a 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -14,6 +14,10 @@
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+VERSION=1.7
+PRODUCT=drakx-installer-binaries
+
  #
  # Portions from Erik Troan (ewt@redhat.com) Copyright 1996 Red Hat Software 
  #
@@ -44,21 +48,20 @@ top_dir = .
 
 include $(top_dir)/Makefile.common
 include $(top_dir)/../Makefile.config
+ARCHDIR=$(ARCH)
+ifeq (i386, $(ARCH))
+ARCHDIR=i586
+endif
 
-
-DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64
+DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64 -DARCH=\"$(ARCHDIR)\" -DCONFIG_USE_ZLIB
 
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
-ifeq (ppc, $(ARCH))
-INIT_HEADERS=init-libc-headers.h
-else
 ifeq (DIETLIBC, $(L))
 INIT_HEADERS=minilibc.h
 else
 INIT_HEADERS=init-libc-headers.h
 endif
-endif
 
 INIT_DEFS = -DINIT_HEADERS=\"$(INIT_HEADERS)\"
 
@@ -70,15 +73,7 @@ INITSRC = init.c
 INIT_DEFS += $(GLIBC_INCLUDES)
 endif
 
-INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\"
-ifdef MOVE
-INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runstage2.pl\"
-else
-INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runinstall2\"
-endif
-
 INITOBJS = $(subst .c,.o,$(INITSRC))
-INITOBJS-STAGE2 = $(subst .c,-STAGE2.o,$(INITSRC))
 
 
  #- frontends
@@ -94,14 +89,13 @@ FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC))
 
 FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS)
 
+STAGE1_OWN_LIBS =
 ifeq (DIETLIBC, $(L))
-INSMOD = insmod-busybox
+STAGE1_OWN_LIBS = /usr/$(LIB)/libz-diet.a
 else
-INSMOD = insmod-modutils
+STAGE1_OWN_LIBS = /usr/$(LIB)/libz.a
 endif
 
-STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a
-
 
 ifeq (DIETLIBC, $(L))
 STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a
@@ -110,7 +104,7 @@ STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a
 endif
 
  #- stage1 itself
-STAGE1SRC = stage1.c log.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c
+STAGE1SRC = stage1.c log.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.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
@@ -122,8 +116,6 @@ ALLSRC = $(INITSRC) $(STAGE1_ALLSRC)
 
 
 
-STAGE1OBJS-CDROM = $(subst .c,-CDROM.o,$(STAGE1SRC) $(CDROMSRC))
-
 CDROM_DEFS = -DSPAWN_SHELL -DDISABLE_DISK -DDISABLE_NETWORK
 
 
@@ -139,32 +131,23 @@ NETWORK_STANDALONE_DEFS = -DDISABLE_CDROM -DDISABLE_DISK -DENABLE_NETWORK_STANDA
 
 STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1_ALLSRC))
 
-BINS = init init-stage2 stage1-full dhcp-client
+BINS = init stage1 dhcp-client rescue-gui
 
-ifndef MOVE
+DIRS += pci-resource pcmcia-resource usb-resource slang newt ppp/pppd rp-pppoe/src
 ifeq (i386, $(ARCH))
-BINS += stage1-cdrom stage1-network
+DIRS += pcmcia sysfs
 endif
 ifeq (x86_64, $(ARCH))
-BINS += stage1-cdrom stage1-network
-endif
-endif
-
-DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt ppp/pppd rp-pppoe/src
-ifeq (i386, $(ARCH))
-DIRS += pcmcia_
-endif
-ifeq (x86_64, $(ARCH))
-DIRS += pcmcia_
+DIRS += pcmcia sysfs
 endif
 
 
 ifeq (i386,$(ARCH))
-PCMCIA_LIB = pcmcia_/libpcmcia.a
+PCMCIA_LIB = pcmcia/libpcmcia.a sysfs/libsysfs.a
 PCMCIA_DEFS = -DENABLE_PCMCIA
 endif
 ifeq (x86_64,$(ARCH))
-PCMCIA_LIB = pcmcia_/libpcmcia.a
+PCMCIA_LIB = pcmcia/libpcmcia.a sysfs/libsysfs.a
 PCMCIA_DEFS = -DENABLE_PCMCIA
 endif
 
@@ -183,19 +166,7 @@ init: $(INITOBJS)
 	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
 	$(STRIPCMD) $@
 
-init-stage2: $(INITOBJS-STAGE2)
-	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
-	$(STRIPCMD) $@
-
-stage1-cdrom: $(STAGE1OBJS-CDROM) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
-	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
-	$(STRIPCMD) $@
-
-stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
-	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
-	$(STRIPCMD) $@
-
-stage1-full: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) bootsplash.o $(PCMCIA_LIB) $(STAGE1_LIBC)
+stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) bootsplash.o $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
 	$(STRIPCMD) $@
 
@@ -205,13 +176,7 @@ dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWOR
 
 
 $(INITOBJS): %.o: %.c
-	$(COMPILE) $(INIT_DEFS) $(INIT_DEFS_ADD) -c $<
-
-$(INITOBJS-STAGE2): %-STAGE2.o: %.c
-	$(COMPILE) $(INIT_DEFS) $(INIT_DEFS_ADD_STAGE2) -c $< -o $@
-
-$(STAGE1OBJS-CDROM): %-CDROM.o: %.c
-	$(DIET) $(COMPILE) $(INCLUDES) $(CDROM_DEFS) -c $< -o $@
+	$(COMPILE) $(INIT_DEFS) -c $<
 
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
 	$(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@
@@ -232,22 +197,23 @@ clean: localclean
 	done
 
 localclean:
-	rm -f *.o .depend *.rdz *.img rescue-gui init-move $(BINS)
-
+	rm -f *.o .depend *.rdz *.img $(BINS)
 
-tar-mkinitrd_helper: clean
-	rm -rf mkinitrd_helper-subdir
-	mkdir mkinitrd_helper-subdir
-	cd mkinitrd_helper-subdir ; cp -a ../insmod-busybox ../Makefile.common ../insmod.h ../log.h . ; \
-	    cp ../Makefile.mkinitrd_helper Makefile
-	tar cfj mkinitrd_helper.tar.bz2 mkinitrd_helper-subdir --exclude CVS
-	rm -rf mkinitrd_helper-subdir
 
 rescue-gui: rescue-gui.o frontend-common.o $(FRONTEND_LINK) $(STAGE1_LIBC)
 	$(DIET) $(CC) $(LDFLAGS) -o $@ $^
 	$(STRIPCMD) $@
 
 
+tar:
+	rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
+	mkdir -p $(PRODUCT)-$(VERSION)
+	svn export -q . $(PRODUCT)-$(VERSION)/mdk-stage1
+	svn export -q ../kernel $(PRODUCT)-$(VERSION)/kernel
+	cp ../Makefile.config $(PRODUCT)-$(VERSION)/
+	tar cfj $(PRODUCT)-$(VERSION).tar.bz2 $(PRODUCT)-$(VERSION)
+	rm -rf $(PRODUCT)-$(VERSION)
+
 .depend:
 	$(CPP) $(CFLAGS) -M $(ALLSRC) > .depend
 
@@ -256,8 +222,6 @@ include .depend
 endif
 
 
-*-CDROM.o: %-CDROM.o: %.o
-
 *-NETWORK.o: %-NETWORK.o: %.o
 
 *-FULL.o: %-FULL.o: %.o