webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix devel-images build

Browse Source
This commit is contained in:
Arne Fitzenreiter
2008-12-22 15:33:24 +01:00
parent 6851d3d7c2
commit dc2c64120f
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/packages-list.txt
View File

@@ -242,6 +242,7 @@
* portmap_5beta * portmap_5beta
* postfix-2.5.5 * postfix-2.5.5
* ppp-2.4.4 * ppp-2.4.4
* pptp-1.7.2
* procps-3.2.6 * procps-3.2.6
* psmisc-22.2 * psmisc-22.2
* qemu-0.9.1 * qemu-0.9.1
@@ -266,7 +267,7 @@
* snort-2.6.1.5 * snort-2.6.1.5
* sox-12.18.1 * sox-12.18.1
* spandsp-0.0.4pre15 * spandsp-0.0.4pre15
* splix-1.1.1 * splix-2.0.0-rc2
* squashfs3.4 * squashfs3.4
* squid-2.7.STABLE5 * squid-2.7.STABLE5
* squidGuard-1.3 * squidGuard-1.3

8
lfs/usb-stick
View File

@@ -48,6 +48,12 @@ IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
IMGfs := /install/images/fs IMGfs := /install/images/fs
ifeq "$(ED)" "devel"
DISKSIZE=480000
else
DISKSIZE=120000
endif
define COPY_TO_IMG define COPY_TO_IMG
mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \ mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
for i in /0 `seq 0 7`; do \ 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 # Partitionned images : make a file system bigger than iso size
# that fit on 128MB key to let free space available # that fit on 128MB key to let free space available
# on the unique partition. Image will be compressed later # 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) IMAGE=$(IMGfs); $(COPY_TO_IMG)
# usb-hdd (64 heads, 32 sectors geometry, on a partition 1) # usb-hdd (64 heads, 32 sectors geometry, on a partition 1)

4
make.sh
View File

@@ -662,11 +662,11 @@ buildpackages() {
$0 git log $0 git log
# Create images for install # Create images for install
ipfiremake cdrom ED=full ipfiremake cdrom ED=$IPFVER
# Check if there is a loop device for building in virtual environments # Check if there is a loop device for building in virtual environments
if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
ipfiremake usb-stick ipfiremake usb-stick ED=$IPFVER
fi fi
# Create updater package # Create updater package