From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 22 Dec 2008 14:33:24 +0000 (+0100)
Subject: Fix devel-images build
X-Git-Tag: v2.5-beta1~244
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=dc2c64120fcc3aa388d8c00ef04c273fefc6f52c

Fix devel-images build
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 061af4173d..7c8f6b68f5 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -242,6 +242,7 @@
 * portmap_5beta
 * postfix-2.5.5
 * ppp-2.4.4
+* pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
 * qemu-0.9.1
@@ -266,7 +267,7 @@
 * snort-2.6.1.5
 * sox-12.18.1
 * spandsp-0.0.4pre15
-* splix-1.1.1
+* splix-2.0.0-rc2
 * squashfs3.4
 * squid-2.7.STABLE5
 * squidGuard-1.3
diff --git a/lfs/usb-stick b/lfs/usb-stick
index 6a62e27190..29486103b5 100644
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -48,6 +48,12 @@ IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
 IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
 IMGfs  := /install/images/fs
 
+ifeq "$(ED)" "devel"
+	DISKSIZE=480000
+else
+	DISKSIZE=120000
+endif
+
 define COPY_TO_IMG
 	mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
 	for i in /0 `seq 0 7`; do \
@@ -80,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Partitionned images : make a file system bigger than iso size
 	# that fit on 128MB key to let free space available
 	# on the unique partition. Image will be compressed later
-	dd bs=1k if=/dev/zero of=$(IMGfs) count=120000
+	dd bs=1k if=/dev/zero of=$(IMGfs) count=$(DISKSIZE)
 	IMAGE=$(IMGfs); $(COPY_TO_IMG)
 	
 	# usb-hdd (64 heads, 32 sectors geometry, on a partition 1)
diff --git a/make.sh b/make.sh
index d1eecd0ca4..36fd5a051a 100755
--- a/make.sh
+++ b/make.sh
@@ -662,11 +662,11 @@ buildpackages() {
   $0 git log
 
   # Create images for install
-	ipfiremake cdrom ED=full
+	ipfiremake cdrom ED=$IPFVER
 	
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-  	ipfiremake usb-stick
+	ipfiremake usb-stick ED=$IPFVER
   fi
 
   # Create updater package