Author: alexander
Date: 2006-08-12 04:23:23 -0600 (Sat, 12 Aug 2006)
New Revision: 1702

Modified:
   branches/6.2/packages/lilo/Makefile
Log:
Upgraded lilo to a version that supports device mapper natively.
Dropped the patch since it is fully merged now.


Modified: branches/6.2/packages/lilo/Makefile
===================================================================
--- branches/6.2/packages/lilo/Makefile 2006-08-09 13:15:08 UTC (rev 1701)
+++ branches/6.2/packages/lilo/Makefile 2006-08-12 10:23:23 UTC (rev 1702)
@@ -1,16 +1,13 @@
 # lilo Makefile
 
 NM= lilo
-VRS= 22.7.1
+VRS= 22.7.3
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).src.tar.gz
-URL-$(FILE)= http://www.linuxfromscratch.org/~alexander/$(FILE)
-SHA-$(FILE)= b431bb0756e1f42c38fc4645063acaea7f2ddcc7
+URL-$(FILE)= http://home.san.rr.com/johninsd/pub/linux/lilo/$(FILE)
+SHA-$(FILE)= d6de449607dfca518ca4e0d5d3be5d7d98eab0e5
 
-PATCH1= $(NM)-22.6.1-devmapper.patch
-URL-$(PATCH1)= http://www.saout.de/misc/$(PATCH1)
-SHA-$(PATCH1)= a4fca3ffb2d29c2866d2bfeb1e92fdbd048a3d36
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -19,14 +16,13 @@
        chroot "$(MP)" $(chenv-blfs) \
        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
-ifneq ($(LFS-ARCH),ppc)
+stage2: Makefile $(FILE)
        $(std_build)
-endif
 
 compile-stage2:
-       patch -Np1 -i ../$(PATCH1)
-       make ROOT="" $(PM)
+       # We don't set -DATARAID because it doesn't work (DM major is dynamic)
+       sed -i 's/-DMDPRAID/& -DDEVMAPPER -DAUTOAUTO/' Makefile
+       make ROOT="" all
        make ROOT="" install
 
 clean:

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to