ISO vergößert und XAMPP-1.5.1 DEVEL Paket installiert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@74 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/cdrom b/lfs/cdrom
index d437933aa7b8ab21c6ec655b905767abd407dee1..9a20b2ffb453c2d7a94d83574a45b1dc780b3fb9 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -120,15 +120,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                cp /boot/vmlinuz-installer                    /install/cdrom/boot/isolinux/vmlinuz; \
                cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
                cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
-               sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
+               sed -e 's/boot IPFire/boot IPFire $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
                        > /install/message; \
                cp /install/message /install/cdrom/boot/isolinux/message; \
                cd /install/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 \
                        . > /install/images/$(SNAME)-install-$(VERSION).$(MACHINE).iso; \
-               echo "compute size +32 blocks for bootsector/fat/etc..." && \
-               dd bs=1024 count=$$((`du -k -s ../cdrom|awk '{print $$1}'` + 32)) if=/dev/zero of=/install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso; \
+               echo "compute size +64 blocks for bootsector/fat/etc..." && \
+               dd bs=1024 count=$$((`du -k -s ../cdrom|awk '{print $$1}'` + 64)) if=/dev/zero of=/install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso; \
                echo "move boot files on top of disk" && \
                rm -rf boot && \
                mkdosfs -n IPCOPBOOT -F 16 -I /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \

diff --git a/lfs/xampp b/lfs/xampp
index 416e80ff69289daabe3291c2cdb1e83c600b840d..99a152fe4b3c049d409426b54924ab7b78b0b1cf 100644 (file)
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -44,11 +44,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       xampp-linux-devel-1.5.1.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+xampp-linux-devel-$(VER).tar.gz        = http://switch.dl.sourceforge.net/sourceforge/xampp/xampp-linux-devel-$(VER).tar.gz
 
 $(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f
+xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9
 
 install : $(TARGET)
 
@@ -77,7 +80,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
        chown -R nobody.nobody /opt/lampp/htdocs
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)