[Ipcop-svn] SF.net SVN: ipcop: [114] ipcop/trunk/lfs

[<ri...@us...>]

Revision: 114
          http://ipcop.svn.sourceforge.net/ipcop/?rev=114&view=rev
Author:   riddles
Date:     2007-04-12 07:52:01 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Fix Makefile if statements

Modified Paths:
--------------
    ipcop/trunk/lfs/3cp4218
    ipcop/trunk/lfs/amedyn2
    ipcop/trunk/lfs/busybox
    ipcop/trunk/lfs/cdrom
    ipcop/trunk/lfs/driver.img
    ipcop/trunk/lfs/initrd
    ipcop/trunk/lfs/scsi.img

Modified: ipcop/trunk/lfs/3cp4218
===================================================================
--- ipcop/trunk/lfs/3cp4218	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/3cp4218	2007-04-12 14:52:01 UTC (rev 114)
@@ -89,11 +89,11 @@
 		-e 's%^.*DEST_KERNEL_MAIN =.*$$%DEST_KERNEL_MAIN = 2.6%' \
 		-e 's/depmod -a//' $$i; \
 		done
-	if [ "$(MACHINE)" = "alpha" -o "$(MACHINE)" = "ppc" ]; then \
-		cd $(DIR_APP) && for i in Makefile */Makefile; do \
+ifneq "$(MACHINE)" "i486"
+	cd $(DIR_APP) && for i in Makefile */Makefile; do \
 		sed -i -e 's/-march=$$(DEST_MACHINE)//' $$i; \
-		done; \
-	fi
+		done
+endif
 	cd $(DIR_APP)/firmware && sed -i -e 's+^BIN_PATH.*$$+BIN_PATH = $(CONFIG_ROOT)/firmware+' Makefile
 	cd $(DIR_APP) && sed -i "384s,^,//&,g" module2/xdslusb.c
 	cd $(DIR_APP) && make 3COM_MODULE2

Modified: ipcop/trunk/lfs/amedyn2
===================================================================
--- ipcop/trunk/lfs/amedyn2	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/amedyn2	2007-04-12 14:52:01 UTC (rev 114)
@@ -90,11 +90,12 @@
 		-e 's%^.*DEST_KERNEL_MAIN =.*$$%DEST_KERNEL_MAIN = 2.6%' \
 		-e 's/depmod -ae//' $$i; \
 	done
-	if [ "$(MACHINE)" = "alpha" -o "$(MACHINE)" = "ppc" ]; then \
-		cd $(DIR_APP) && for i in Makefile */Makefile; do \
+
+ifneq "$(MACHINE)" "i486"
+	cd $(DIR_APP) && for i in Makefile */Makefile; do \
 		sed -i -e 's/-march=$$(DEST_MACHINE)//' $$i; \
-		done; \
-	fi
+		done
+endif
 
 	cd $(DIR_APP)/module && make
 	cd $(DIR_APP)/module && install -D -m 0644 amedyn2.ko /lib/modules/$(KVER)/extra/amedyn2.ko

Modified: ipcop/trunk/lfs/busybox
===================================================================
--- ipcop/trunk/lfs/busybox	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/busybox	2007-04-12 14:52:01 UTC (rev 114)
@@ -85,11 +85,11 @@
 
 	cd $(DIR_APP) && cp -f $(DIR_PATCHES)/$(THISAPP)-config .config
 
-	if [ "$(MACHINE)" = "alpha" ]; then \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_INSMOD//' Config.h; \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_RMMOD//' Config.h; \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_MODPROBE//' Config.h; \
-	fi
+ifeq "$(MACHINE)" "alpha"
+	cd $(DIR_APP) && sed -i -e 's/#define BB_INSMOD//' Config.h
+	cd $(DIR_APP) && sed -i -e 's/#define BB_RMMOD//' Config.h
+	cd $(DIR_APP) && sed -i -e 's/#define BB_MODPROBE//' Config.h
+endif
 
 	cd $(DIR_APP) && make
 
@@ -107,12 +107,12 @@
 			ln -sf busybox $$i; \
 		done
 
-	if [ "$(MACHINE)" = "alpha" ]; then \
-		cd $(INSTALLER_DIR)/initrd/bin && rm -f rmmod modprobe insmod; \
-		cp /sbin/insmod.static $(INSTALLER_DIR)/initrd/bin/insmod; \
-		cd $(INSTALLER_DIR)/initrd/bin && ln -s insmod modprobe; \
-		cd $(INSTALLER_DIR)/initrd/bin && ln -s insmod rmmod; \
-	fi
+ifeq "$(MACHINE)" "alpha"
+	cd $(INSTALLER_DIR)/initrd/bin && rm -f rmmod modprobe insmod
+	cp /sbin/insmod.static $(INSTALLER_DIR)/initrd/bin/insmod
+	cd $(INSTALLER_DIR)/initrd/bin && ln -s insmod modprobe
+	cd $(INSTALLER_DIR)/initrd/bin && ln -s insmod rmmod
+endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

Modified: ipcop/trunk/lfs/cdrom
===================================================================
--- ipcop/trunk/lfs/cdrom	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/cdrom	2007-04-12 14:52:01 UTC (rev 114)
@@ -147,54 +147,56 @@
 		$(INSTALLER_DIR)/cdrom/doc/francais
 	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} $(INSTALLER_DIR)/cdrom/doc
 
-	if [ "$(MACHINE)" == "i486" ]; then \
-		cp $(DIR_DL)/rawrite.exe $(INSTALLER_DIR)/cdrom/dosutils; \
-		unzip -j -L $(DIR_DL)/rawwritewin*.zip -x "*.txt" -d $(INSTALLER_DIR)/cdrom/dosutils; \
-	elif [ "$(MACHINE)" == "ppc" ]; then \
-		rm -fr $(INSTALLER_DIR)/cdrom/dosutils; \
-		rm -f $(INSTALLER_DIR)/cdrom/images/drivers-$(VERSION).img  \
-			$(INSTALLER_DIR)/cdrom/images/scsidrv-$(VERSION).img; \
-	fi
-
+ifeq "$(MACHINE)" "i486"
+	cp $(DIR_DL)/rawrite.exe $(INSTALLER_DIR)/cdrom/dosutils
+	unzip -j -L $(DIR_DL)/rawwritewin*.zip -x "*.txt" -d $(INSTALLER_DIR)/cdrom/dosutils
+endif
+ifeq "$(MACHINE)" "ppc"
+	rm -fr $(INSTALLER_DIR)/cdrom/dosutils
+	rm -f $(INSTALLER_DIR)/cdrom/images/drivers-$(VERSION).img \
+		$(INSTALLER_DIR)/cdrom/images/scsidrv-$(VERSION).img
+endif
 	@$(POSTBUILD)
 endif
 
 ifeq "$(PASS)" "2"
 	# make the ISO
-	if [ "$(MACHINE)" == "i486" ]; then \
-		mkdir -p $(INSTALLER_DIR)/cdrom/boot/isolinux; \
-		dd if=/dev/zero  bs=1k count=2            > $(INSTALLER_DIR)/cdrom/boot/isolinux/boot.catalog; \
-		cp $(INSTALLER_DIR)/images/cdinitrd              $(INSTALLER_DIR)/cdrom/boot/isolinux/instroot; \
-		cp /boot/vmlinuz-$(KVER)                    $(INSTALLER_DIR)/cdrom/boot/isolinux/vmlinuz; \
-		cp $(DIR_SRC)/config/kernel/syslinux.cfg    $(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.cfg; \
-		sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
-							>   $(INSTALLER_DIR)/cdrom/boot/isolinux/message; \
-		cp /usr/lib/syslinux/isolinux.bin           $(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.bin; \
-		cd $(INSTALLER_DIR)/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-			-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-			-c boot/isolinux/boot.catalog . > $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso; \
-	elif [ "$(MACHINE)" == "alpha" ]; then \
-		mkdir -p $(INSTALLER_DIR)/cdrom/etc; \
-		cp /boot/vmlinuz-$(KVER) $(INSTALLER_DIR)/cdrom/vmlinuz; \
-		cp $(INSTALLER_DIR)/images/cdinitrd  $(INSTALLER_DIR)/cdrom/instroot; \
-		cp /boot/bootlx $(INSTALLER_DIR)/cdrom; \
-		cp $(DIR_SRC)/config/kernel/aboot.conf $(INSTALLER_DIR)/cdrom/etc/aboot.conf; \
-		cd $(INSTALLER_DIR)/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-			. > $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso; \
-		isomarkboot $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso bootlx; \
-	elif [ "$(MACHINE)" == "ppc" ]; then \
-		mkdir -p $(INSTALLER_DIR)/cdrom/boot; \
-		cp $(DIR_SRC)/config/cdrom/README_OldWorld_Macs.txt $(INSTALLER_DIR)/cdrom; \
-		cp /boot/vmlinux-$(KVER) $(INSTALLER_DIR)/cdrom/boot/vmlinux; \
-		cp $(INSTALLER_DIR)/images/cdinitrd $(INSTALLER_DIR)/cdrom/boot/instroot; \
-		cp $(DIR_SRC)/config/ppc/yaboot.conf-cdinstall $(INSTALLER_DIR)/cdrom/boot/yaboot.conf; \
-		cp /usr/lib/yaboot/yaboot $(INSTALLER_DIR)/cdrom/boot; \
-		cp $(DIR_SRC)/config/ppc/ofboot.b-cdinstall $(INSTALLER_DIR)/cdrom/boot/ofboot.b; \
-		sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
-							> $(INSTALLER_DIR)/cdrom/boot/message; \
-		cd $(INSTALLER_DIR) && mkisofs -hfs -part -map $(DIR_SRC)/config/ppc/hfs.map -no-desktop \
-			-hfs-volid "IPCop $(VERSION) $(MACHINE) CDRom" -hfs-bless cdrom/boot -r \
-			-o $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso cdrom; \
-	fi
+ifeq "$(MACHINE)" "i486"
+	mkdir -p $(INSTALLER_DIR)/cdrom/boot/isolinux
+	dd if=/dev/zero  bs=1k count=2          >    $(INSTALLER_DIR)/cdrom/boot/isolinux/boot.catalog
+	cp $(INSTALLER_DIR)/images/cdinitrd          $(INSTALLER_DIR)/cdrom/boot/isolinux/instroot
+	cp /boot/vmlinuz-$(KVER)                     $(INSTALLER_DIR)/cdrom/boot/isolinux/vmlinuz
+	cp $(DIR_SRC)/config/kernel/syslinux.cfg     $(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.cfg
+	sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
+						>    $(INSTALLER_DIR)/cdrom/boot/isolinux/message
+	cp /usr/lib/syslinux/isolinux.bin            $(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.bin
+	cd $(INSTALLER_DIR)/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
+		-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+		-c boot/isolinux/boot.catalog . >    $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso
 endif
+ifeq "$(MACHINE)" "alpha"
+	mkdir -p $(INSTALLER_DIR)/cdrom/etc
+	cp /boot/vmlinuz-$(KVER) $(INSTALLER_DIR)/cdrom/vmlinuz
+	cp $(INSTALLER_DIR)/images/cdinitrd  $(INSTALLER_DIR)/cdrom/instroot
+	cp /boot/bootlx $(INSTALLER_DIR)/cdrom
+	cp $(DIR_SRC)/config/kernel/aboot.conf $(INSTALLER_DIR)/cdrom/etc/aboot.conf
+	cd $(INSTALLER_DIR)/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
+		. > $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso
+	isomarkboot $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso bootlx
+endif
+ifeq "$(MACHINE)" "ppc"
+	mkdir -p $(INSTALLER_DIR)/cdrom/boot
+	cp $(DIR_SRC)/config/cdrom/README_OldWorld_Macs.txt $(INSTALLER_DIR)/cdrom
+	cp /boot/vmlinux-$(KVER) $(INSTALLER_DIR)/cdrom/boot/vmlinux
+	cp $(INSTALLER_DIR)/images/cdinitrd $(INSTALLER_DIR)/cdrom/boot/instroot
+	cp $(DIR_SRC)/config/ppc/yaboot.conf-cdinstall $(INSTALLER_DIR)/cdrom/boot/yaboot.conf
+	cp /usr/lib/yaboot/yaboot $(INSTALLER_DIR)/cdrom/boot
+	cp $(DIR_SRC)/config/ppc/ofboot.b-cdinstall $(INSTALLER_DIR)/cdrom/boot/ofboot.b
+	sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
+						> $(INSTALLER_DIR)/cdrom/boot/message
+	cd $(INSTALLER_DIR) && mkisofs -hfs -part -map $(DIR_SRC)/config/ppc/hfs.map -no-desktop \
+		-hfs-volid "IPCop $(VERSION) $(MACHINE) CDRom" -hfs-bless cdrom/boot -r \
+		-o $(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso cdrom
+endif
 
+endif

Modified: ipcop/trunk/lfs/driver.img
===================================================================
--- ipcop/trunk/lfs/driver.img	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/driver.img	2007-04-12 14:52:01 UTC (rev 114)
@@ -90,11 +90,11 @@
 	# Show size used
 	ls -l /tmp/drivers.lzma
 
-	if [ "$(MACHINE)" = "alpha" -o "$(MACHINE)" = "ppc" ]; then \
-		cp /tmp/drivers.lzma $(INSTALLER_DIR)/images/drivers-$(VERSION).img; \
-	else \
-		dd if=/tmp/drivers.lzma of=$(INSTALLER_DIR)/images/drivers-$(VERSION).img bs=1440k count=1 conv=sync; \
-	fi
+ifeq "$(MACHINE)" "i486"
+	dd if=/tmp/drivers.lzma of=$(INSTALLER_DIR)/images/drivers-$(VERSION).img bs=1440k count=1 conv=sync
+else
+	cp /tmp/drivers.lzma $(INSTALLER_DIR)/images/drivers-$(VERSION).img
+endif
 
 	rm -rf /tmp/drivers.lzma /tmp/drivers.tar /tmp/bin /tmp/lib
 

Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/initrd	2007-04-12 14:52:01 UTC (rev 114)
@@ -72,12 +72,12 @@
 	chmod 755 $(INSTALLER_DIR)/initrd/etc/halt $(INSTALLER_DIR)/initrd/etc/rc
 	cp -f /usr/share/terminfo/l/linux $(INSTALLER_DIR)/initrd/usr/share/terminfo/l
 
-	if [ "$(MACHINE)" = "alpha" ]; then \
-		tar cvzf /tmp/libc.tgz /usr/share/locale /lib/libc.* /lib/libc-* /lib/libdl* /lib/libnsl* /lib/libresolv* /lib/libutil* /lib/ld* /lib/libcrypt*; \
-		tar xvzf /tmp/libc.tgz -C $(INSTALLER_DIR)/initrd; \
-		strip $(INSTALLER_DIR)/initrd/lib/*; \
-		rm -f /tmp/libc.tgz; \
-	fi
+ifeq "$(MACHINE)" "alpha"
+	tar cvzf /tmp/libc.tgz /usr/share/locale /lib/libc.* /lib/libc-* /lib/libdl* /lib/libnsl* /lib/libresolv* /lib/libutil* /lib/ld* /lib/libcrypt*; \
+	tar xvzf /tmp/libc.tgz -C $(INSTALLER_DIR)/initrd; \
+	strip $(INSTALLER_DIR)/initrd/lib/*; \
+	rm -f /tmp/libc.tgz; \
+endif
 
 	# Extra modules
 	-mkdir -p $(INSTALLER_DIR)/initrd/lib/modules/$(KVER)/kernel/drivers/scsi

Modified: ipcop/trunk/lfs/scsi.img
===================================================================
--- ipcop/trunk/lfs/scsi.img	2007-04-12 14:44:58 UTC (rev 113)
+++ ipcop/trunk/lfs/scsi.img	2007-04-12 14:52:01 UTC (rev 114)
@@ -81,11 +81,11 @@
 	#as we are near the 1.44 floppy size limit, always use high compression
 	cd /tmp && tar -cf - bin var lib/modules/$(KVER) | lzma -si -a2 -d24 -mfbt2 e scsi.lzma
 
-	if [ "$(MACHINE)" = "alpha" -o "$(MACHINE)" = "ppc" ]; then \
-		cp /tmp/scsi.lzma $(INSTALLER_DIR)/images/scsidrv-$(VERSION).img; \
-	else \
-		dd if=/tmp/scsi.lzma of=$(INSTALLER_DIR)/images/scsidrv-$(VERSION).img bs=1440k count=1 conv=sync; \
-	fi
+ifeq "$(MACHINE)" "i486"
+	dd if=/tmp/scsi.lzma of=$(INSTALLER_DIR)/images/scsidrv-$(VERSION).img bs=1440k count=1 conv=sync
+else
+	cp /tmp/scsi.lzma $(INSTALLER_DIR)/images/scsidrv-$(VERSION).img
+endif
 
 	# Show size used
 	ls -l /tmp/scsi.lzma


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.