From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3acd7b850e59f99d455c00f62e9a9a4167bfe5d
Date: Fri, 24 May 2013 18:50:10 +0200 [thread overview]
Message-ID: <20130524165011.2D06F20170@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8936 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, next has been updated
via b3acd7b850e59f99d455c00f62e9a9a4167bfe5d (commit)
via e7902feca41cfcec98edeac469390ed293188725 (commit)
via 89fd5ae0689ae125a7d8571c0043ae652dc18e91 (commit)
via 76d5aabd9d470992585bc13f2ea483f008da95eb (commit)
from ff0a51dafdeda6c6dd7e8bed981e6bcc7b46392a (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 b3acd7b850e59f99d455c00f62e9a9a4167bfe5d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 24 18:49:30 2013 +0200
boot menu: Add description texts.
commit e7902feca41cfcec98edeac469390ed293188725
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 24 18:30:47 2013 +0200
boot image: Increase timeout to one minute.
commit 89fd5ae0689ae125a7d8571c0043ae652dc18e91
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 24 18:27:31 2013 +0200
Add option for boot.ipfire.org to disk image
commit 76d5aabd9d470992585bc13f2ea483f008da95eb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 24 17:59:48 2013 +0200
ipfire-netboot: New package.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/ipfire-netboot | 2 ++
config/syslinux/syslinux.cfg | 28 +++++++++++++++++++++++++++-
lfs/cdrom | 1 +
lfs/{syslinux => ipfire-netboot} | 26 +++++++++++++++++++-------
make.sh | 1 +
5 files changed, 50 insertions(+), 8 deletions(-)
create mode 100644 config/rootfiles/common/i586/ipfire-netboot
copy lfs/{syslinux => ipfire-netboot} (80%)
Difference in files:
diff --git a/config/rootfiles/common/i586/ipfire-netboot b/config/rootfiles/common/i586/ipfire-netboot
new file mode 100644
index 0000000..b73261f
--- /dev/null
+++ b/config/rootfiles/common/i586/ipfire-netboot
@@ -0,0 +1,2 @@
+#usr/share/ipfire-netboot
+#usr/share/ipfire-netboot/ipxe.lkrn
diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 74d4e3e..8832089 100644
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -2,7 +2,7 @@
UI vesamenu.c32
PROMPT 0
DEFAULT installer
-TIMEOUT 60
+TIMEOUT 600
MENU HSHIFT 0
MENU WIDTH 40
@@ -24,6 +24,10 @@ MENU TITLE Welcome!
LABEL installer
MENU LABEL Install IPFire VERSION
+ TEXT HELP
+Install the version of IPFire that is
+on this disk.
+ ENDTEXT
KERNEL vmlinuz
INITRD instroot
APPEND vga=791
@@ -41,11 +45,17 @@ MENU BEGIN other
LABEL novga
MENU LABEL Install IPFire (text mode)
+ TEXT HELP
+Run the installer in text mode.
+ ENDTEXT
KERNEL vmlinuz
INITRD instroot
LABEL unattended
MENU LABEL Unattended installation
+ TEXT HELP
+Run an unattended installation.
+ ENDTEXT
KERNEL vmlinuz
INITRD instroot
APPEND unattended
@@ -62,9 +72,25 @@ MENU BEGIN tools
LABEL memtest
MENU LABEL memtest86+
+ TEXT HELP
+Diagnose memory problems with memtest86+.
+ ENDTEXT
KERNEL memtest
LABEL hdt
MENU LABEL Hardware Detection Tool
+ TEXT HELP
+Check your hardware with the Hardware Detection
+Tool!
+ ENDTEXT
KERNEL hdt.c32
MENU END
+
+MENU SEPARATOR
+
+LABEL netboot
+ MENU LABEL boot.ipfire.org
+ TEXT HELP
+Boot from the IPFire Boot Server!
+ ENDTEXT
+ KERNEL netboot
diff --git a/lfs/cdrom b/lfs/cdrom
index 401df52..48ac891 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -93,6 +93,7 @@ ifneq "$(MACHINE_TYPE)" "arm"
cp /install/images/initrd /install/cdrom/boot/isolinux/instroot
cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png
cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest
+ cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot
cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin
cp /usr/share/hwdata/pci.ids /install/cdrom/boot/isolinux/pci.ids
cp -vf /usr/share/syslinux/*.c32 /install/cdrom/boot/isolinux/
diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
new file mode 100644
index 0000000..0590d9b
--- /dev/null
+++ b/lfs/ipfire-netboot
@@ -0,0 +1,88 @@
+###############################################################################
+# #
+# 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 = v1.0
+PXE_VER = c4bce43
+
+THISAPP = ipfire-netboot-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = http://source.ipfire.org/releases/ipfire-netboot/
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH = i586
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) ipxe-$(PXE_VER).tar.xz
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+ipxe-$(PXE_VER).tar.xz = $(URL_IPFIRE)/ipxe-$(PXE_VER).tar.xz
+
+$(DL_FILE)_MD5 = 257773a52ed5dda3053eb049bee38a60
+ipxe-$(PXE_VER).tar.xz_MD5 = 8aeb94330eb94f3f1e6170e23db0ba27
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+ # Extract iPXE source
+ cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.xz
+ cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
+ cd $(DIR_APP) && make bin/ipxe.lkrn
+
+ # Installation
+ -mkdir -pv /usr/share/ipfire-netboot
+ cd $(DIR_APP) && install -m 644 bin/ipxe.lkrn /usr/share/ipfire-netboot
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 65244c0..3d4fe86 100755
--- a/make.sh
+++ b/make.sh
@@ -766,6 +766,7 @@ buildipfire() {
ipfiremake sendEmail
ipfiremake sysbench
ipfiremake strace
+ ipfiremake ipfire-netboot
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-05-24 16:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130524165011.2D06F20170@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox