[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 865f26ac3242fb39c6b83b19a7a52d83e7a91dfc

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 865f26ac3242fb39c6b83b19a7a52d83e7a91dfc

[git]

[-- Attachment #1: Type: text/plain, Size: 6791 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  865f26ac3242fb39c6b83b19a7a52d83e7a91dfc (commit)
      from  ff441c487d7fc99a20d06dc6d6e99ea4f7c10c69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 865f26ac3242fb39c6b83b19a7a52d83e7a91dfc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Sep 11 13:25:49 2013 +0200

    images: make iso to hybrid image and removed usb-images.
    
    now the iso can transfered to an usb stick and install ipfire.

-----------------------------------------------------------------------

Summary of changes:
 lfs/cdrom     |   1 +
 lfs/usb-stick | 101 ----------------------------------------------------------
 make.sh       |   3 --
 3 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 lfs/usb-stick

Difference in files:
diff --git a/lfs/cdrom b/lfs/cdrom
index ede343e..f19031d 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -113,4 +113,5 @@ else
 	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)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
+	isohybrid /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
 endif
diff --git a/lfs/usb-stick b/lfs/usb-stick
deleted file mode 100644
index 1bfc8a1..0000000
--- a/lfs/usb-stick
+++ /dev/null
@@ -1,101 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = ipfire
-
-THISAPP    = usb-stick
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-full-core$(CORE).img
-IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-full-core$(CORE).img
-IMGfs  := /install/images/fs
-
-DISKSIZE=120000
-
-define COPY_TO_IMG
-	mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
-	for i in /0 `seq 0 7`; do \
-		[ -e /dev/loop$${i} ] || continue; \
-		if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
-			LOOPDEV="/dev/loop$${i}"; \
-			break; \
-		fi; \
-	done; \
-	losetup $$LOOPDEV $$IMAGE && \
-	mount -t vfat $$LOOPDEV /install/mnt && \
-	cp -fR /install/cdrom/* /install/mnt && \
-	mv /install/mnt/boot/isolinux /install/mnt/boot/syslinux && \
-	mv /install/mnt/boot/syslinux/isolinux.cfg \
-	   /install/mnt/boot/syslinux/syslinux.cfg && \
-	umount /install/mnt && \
-	losetup -d $$LOOPDEV && \
-	syslinux $$IMAGE
-endef
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-
-	# usb-fdd superfloppy (partitionless)
-	# compute size +32 blocks for bootsector/fat/etc...
-	dd bs=1024 count=$$((`du -k -s /install/cdrom | awk '{print $$1}'` + 2048 )) \
-		if=/dev/zero \
-		of=$(IMGfdd)
-	IMAGE=$(IMGfdd); $(COPY_TO_IMG)
-
-	# 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=$(DISKSIZE)
-	IMAGE=$(IMGfs); $(COPY_TO_IMG)
-	
-	# usb-hdd (64 heads, 32 sectors geometry, on a partition 1)
-	# use 64 heads as 256 does not work on Award bios (Asus A7V8X-X Gilles)
-	# use 32 sectors a minima or device is not recognised as hard disk (Frank)
-	# add 32 to IMGfs as first partition start at 32
-	COUNT=$$((`du -k -s $(IMGfs) | awk '{print $$1}'` + 32 )); \
-	dd bs=1k if=/dev/zero of=$(IMGhdd) count=$$COUNT
-	# write mbr before partitioning save a 'not msdos fs' warning from sfdisk
-	/usr/sbin/install-mbr -f $(IMGhdd)
-	echo -e "0,,6,*\n;\n;\n;" | sfdisk -qLD -H 64 -S 32 $(IMGhdd)
-	# copy the entire partition, make the fs and dd back
-	dd if=$(IMGfs) of=$(IMGhdd) bs=512 seek=32
-
-	gzip -f9 $(IMGfdd) $(IMGhdd)
-	rm -rf $$LFS/tmp/* $(IMGfs)
diff --git a/make.sh b/make.sh
index 53fbb35..df95e44 100755
--- a/make.sh
+++ b/make.sh
@@ -856,9 +856,6 @@ buildpackages() {
 
   # Check if there is a loop device for building in virtual environments
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
-	if [ "${MACHINE_TYPE}" != "arm" ]; then
-		ipfiremake usb-stick
-	fi
 	ipfiremake flash-images
   fi
 


hooks/post-receive
--
IPFire 2.x development tree