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

[<ges...@us...>]

Revision: 6181
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6181&view=rev
Author:   gespinasse
Date:     2011-12-24 11:26:24 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Remove the unhardened kernel build trick for floppy
If that build, that didn't run or we would need modules compiled the same way.

Modified Paths:
--------------
    ipcop/trunk/lfs/boot.img
    ipcop/trunk/lfs/linux

Modified: ipcop/trunk/lfs/boot.img
===================================================================
--- ipcop/trunk/lfs/boot.img	2011-12-24 11:18:01 UTC (rev 6180)
+++ ipcop/trunk/lfs/boot.img	2011-12-24 11:26:24 UTC (rev 6181)
@@ -66,7 +66,7 @@
 	sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/arch/$(MACHINE)/install-message \
 		| mcopy - i:message
 	mcopy $(DIR_SRC)/config/arch/$(MACHINE)/syslinux-fdinitrd.cfg i:syslinux.cfg
-	mcopy /boot/vmlinuz_unhardened-$(KVER) i:vmlinuz
+	mcopy /boot/vmlinuz-$(KVER) i:vmlinuz
 	mcopy /$(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-mini-initramfs.img i:initrd.img
 	mcopy $(DIR_SRC)/config/arch/$(MACHINE)/splash.rle i:splash.rle
 

Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux	2011-12-24 11:18:01 UTC (rev 6180)
+++ ipcop/trunk/lfs/linux	2011-12-24 11:26:24 UTC (rev 6181)
@@ -138,17 +138,6 @@
 	cd $(DIR_APP) && make clean
 
 ifeq "$(MACHINE)" "i486"
-ifneq "${SKIP_FLOPPY_IMAGES}" "yes"
-	# compile a non hardened vmlinuz for floppy as size is smaller unhardened
-	# CFLAGS_KERNEL is defined empty on Makefile, LDFLAGS value is not defined, only used
-	cd $(DIR_APP) && sed -i -e 's/^CFLAGS_KERNEL.*/CFLAGS_KERNEL = -fno-PIE -fno-PIC -fno-stack-protector -U_FORTIFY_SOURCE -nopie -norelro -nonow -nocombreloc/' Makefile
-	cd $(DIR_APP) && make -j $(PARALLELISM) bzImage
-	cd $(DIR_APP) && cp -f arch/x86/boot/bzImage /boot/vmlinuz_unhardened-$(KVER)
-	cd $(DIR_APP) && make clean
-	# and remove our special hack for normal compilation
-	cd $(DIR_APP) && sed -i 's/^CFLAGS_KERNEL.*/CFLAGS_KERNEL	=/' Makefile
-endif # neq skip floppy
-
 	cd $(DIR_APP) && make -j $(PARALLELISM) all
 	cd $(DIR_APP) && cp -f arch/x86/boot/bzImage /boot/vmlinuz-$(KVER)
 	cd $(DIR_APP) && cp -f System.map /boot/System.map-$(KVER)

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