[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[tyndur-devel] [PATCH 22/22] Images: USB-Stick-Image

Date: Sun, 13 Dec 2015 00:26:12 +0100
From: Max Reitz <max@xxxxxxxxxx>
To: tyndur-devel@xxxxxxxxxx
Subject: [tyndur-devel] [PATCH 22/22] Images: USB-Stick-Image
Message-id: <1449962772-29705-23-git-send-email-max@tyndur.org>
In-reply-to: <1449962772-29705-1-git-send-email-max@tyndur.org>
+ Die Makefileziele image-usb und test-qemu-usb erlauben es, ein Image
  für einen USB-Stick zu bauen.

Signed-off-by: Max Reitz <max@xxxxxxxxxx>
---
 Makefile                          |   8 +-
 build/config/grub_usb.cfg         |  11 +++
 build/config/grub_usb_kernel2.cfg |  23 +++++
 build/config/image_usb.sh         |   3 +
 build/scripts/image_usb_grub1     | 122 ++++++++++++++++++++++++
 build/scripts/image_usb_grub2     | 193 ++++++++++++++++++++++++++++++++++++++
 buildmk.sh                        |   2 +-
 7 files changed, 360 insertions(+), 2 deletions(-)
 create mode 100644 build/config/grub_usb.cfg
 create mode 100644 build/config/grub_usb_kernel2.cfg
 create mode 100644 build/config/image_usb.sh
 create mode 100755 build/scripts/image_usb_grub1
 create mode 100755 build/scripts/image_usb_grub2

diff --git a/Makefile b/Makefile
index 96a6b24..9a6e8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ clean: clean_objs
 	for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done
 	rm -f Makefile.local
 
-.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd
+.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd image-usb test-qemu test-qemu-hd test-qemu-usb
 .PHONY: lbuilds-env
 
 # Code für lbuilds
@@ -73,6 +73,9 @@ image-hd: updateroot
 image-cdrom: updateroot
 	build/scripts/image_cdrom_$(BOOTLOADER)
 
+image-usb: updateroot
+	build/scripts/image_usb_$(BOOTLOADER)
+
 test-qemu-floppy: image-floppy
 	$(QEMU) -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log
 
@@ -82,6 +85,9 @@ test-qemu-hd: image-hd
 test-qemu-cdrom: image-cdrom
 	$(QEMU) -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log
 
+test-qemu-usb: image-usb
+	$(QEMU) -serial stdio -device usb-ehci -drive if=none,id=usb-thumb,file=build/images/usb.img,format=raw -device usb-storage,drive=usb-thumb -net user -net nic,model=rtl8139 | tee qemu-serial.log
+
 test-bochs: image-floppy
 	bochs -f bochs.config
 
diff --git a/build/config/grub_usb.cfg b/build/config/grub_usb.cfg
new file mode 100644
index 0000000..bbd2d8e
--- /dev/null
+++ b/build/config/grub_usb.cfg
@@ -0,0 +1,11 @@
+title tyndur (kernel1)
+kernel /boot/tyndur debug=s
+module /modules/init boot=file:/
+module /modules/pci
+module /modules/usb-storage
+module /modules/usb
+module /modules/ehci
+module /modules/ext2
+module /modules/console servmgr:/term servmgr:/term
+module /modules/servmgr usb-storage:/msd0_p0|ext2:/ vterm:/vterm8/out ehci usb-storage usb ext2 console pci
+boot
diff --git a/build/config/grub_usb_kernel2.cfg b/build/config/grub_usb_kernel2.cfg
new file mode 100644
index 0000000..73cbf6a
--- /dev/null
+++ b/build/config/grub_usb_kernel2.cfg
@@ -0,0 +1,23 @@
+title tyndur (Deutsch)
+kernel /boot/tyndur2 debug=s
+module /modules/init boot=file:/
+module /modules/pci
+module /modules/usb-storage
+module /modules/usb
+module /modules/ehci
+module /modules/ext2
+module /modules/console servmgr:/term servmgr:/term
+module /modules/servmgr usb-storage:/msd0_p0|ext2:/ vterm:/vterm8/out ehci ext2 console pci
+boot
+
+title tyndur (English)
+kernel /boot/tyndur2 debug=s
+module /modules/init boot=file:/ env.LANG=en
+module /modules/pci
+module /modules/usb-storage
+module /modules/usb
+module /modules/ehci
+module /modules/ext2
+module /modules/console servmgr:/term servmgr:/term
+module /modules/servmgr usb-storage:/msd0_p0|ext2:/ vterm:/vterm8/out ehci ext2 console pci
+boot
diff --git a/build/config/image_usb.sh b/build/config/image_usb.sh
new file mode 100644
index 0000000..73b07ef
--- /dev/null
+++ b/build/config/image_usb.sh
@@ -0,0 +1,3 @@
+IMAGE_PATH="build/images/usb.img"
+# Imagegroesse in Megabytes
+IMAGE_SIZE=64
diff --git a/build/scripts/image_usb_grub1 b/build/scripts/image_usb_grub1
new file mode 100755
index 0000000..e04fbd1
--- /dev/null
+++ b/build/scripts/image_usb_grub1
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# Copyright (c) 2008 The tyndur Project. All rights reserved.
+#
+# This code is derived from software contributed to the tyndur Project
+# by Antoine Kaufmann.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#     This product includes software developed by the tyndur Project
+#     and its contributors.
+# 4. Neither the name of the tyndur Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROOT=build/root
+ROOT_COMMON=build/root-common
+ROOT_HD=build/root-hd
+ROOT_LOCAL=build/root-local
+MOUNT=build/mnt
+SUDO=sudo
+
+export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
+
+export LOST_BUILDMK_ROOT="`pwd`"
+source build/config/image_usb.sh
+source config.sh
+
+die()
+{
+    echo $1
+    exit -1
+}
+
+# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr
+# dazu.
+NEW=0
+if ! [ -f $IMAGE_PATH ]; then
+    # Leeres Image erstellen und formatieren
+    dd of=$IMAGE_PATH bs=$((1024 * 1024)) seek=$IMAGE_SIZE count=0
+    build/scripts/create_partition $IMAGE_PATH
+    NEW=1
+fi
+
+
+# Start und Ende der Partition einlesen
+PARTITIONS="`build/scripts/get_partition $IMAGE_PATH`"
+PART_START=`echo $PARTITIONS | awk '{print $1}'`
+PART_SIZE=`echo $PARTITIONS | awk '{print $2}'`
+
+if [ $NEW -ne 0 ]; then
+    LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --sizelimit $(($PART_SIZE * 512)) -o $(($PART_START * 512)) --show`
+    if [ $? -ne 0 ]; then
+        die "Loop Device konnte nicht angelegt werden"
+    fi
+
+    # Dateisystem erstellen
+    $SUDO $LOST_TOOLS_MKE2FS -T ext2 -F -q $LOOP_DEV || die "Dateisystem konnte nicht erstellt werden"
+
+    $SUDO losetup -d $LOOP_DEV
+fi
+
+# Partition mounten
+mkdir -p $MOUNT
+$SUDO mount $IMAGE_PATH $MOUNT -t ext2 -o loop,offset=$((${PART_START} * 512))
+$SUDO chmod 777 -R $MOUNT
+
+# Daten Kopieren
+cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/
+[ -d $ROOT_LOCAL ] && cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/
+
+# GRUB-Konfiguration kopieren
+mkdir -p $MOUNT/boot/grub
+rm -f $MOUNT/boot/grub/menu.lst
+if [ -e $MOUNT/boot/tyndur2 ]; then
+	cat build/config/grub_usb_kernel2.cfg >> $MOUNT/boot/grub/menu.lst
+fi
+if [ -e $MOUNT/boot/tyndur ]; then
+    cat build/config/grub_usb.cfg >> $MOUNT/boot/grub/menu.lst
+fi
+
+
+# Grub kopieren
+if [ $NEW -ne 0 ]; then
+    cp $LOST_GRUB_STAGESDIR/stage? $MOUNT/boot/grub/
+fi
+
+# Partition unmounten und loopback-Device freigeben
+while fuser -m $MOUNT; do true; done
+$SUDO umount $MOUNT
+rmdir $MOUNT
+
+
+# Grub installieren
+if [ $NEW -ne 0 ]; then
+    $LOST_TOOLS_GRUB --no-floppy --batch > /dev/null <<EOF
+    device (hd0) $IMAGE_PATH
+    root (hd0,0)
+    install /boot/grub/stage1 (hd0) /boot/grub/stage2 p /boot/grub/menu.lst
+EOF
+fi
+
diff --git a/build/scripts/image_usb_grub2 b/build/scripts/image_usb_grub2
new file mode 100755
index 0000000..ac8551b
--- /dev/null
+++ b/build/scripts/image_usb_grub2
@@ -0,0 +1,193 @@
+#!/bin/bash
+
+# Copyright (c) 2008 The tyndur Project. All rights reserved.
+#
+# This code is derived from software contributed to the tyndur Project
+# by Antoine Kaufmann.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#     This product includes software developed by the tyndur Project
+#     and its contributors.
+# 4. Neither the name of the tyndur Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROOT=build/root
+ROOT_COMMON=build/root-common
+ROOT_HD=build/root-hd
+ROOT_LOCAL=build/root-local
+MOUNT=build/mnt
+SUDO=sudo
+
+export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
+
+export LOST_BUILDMK_ROOT="`pwd`"
+source build/config/image_usb.sh
+source config.sh
+
+die()
+{
+    echo $1
+    exit -1
+}
+
+if (which grub-mkimage > /dev/null 2>&1); then
+    GRUB2_BIN_PREFIX=grub
+elif (which grub2-mkimage > /dev/null 2>&1); then
+    GRUB2_BIN_PREFIX=grub2
+else
+    die "Konnte grub-mkimage nicht finden"
+fi
+GRUB2_MKIMAGE=$GRUB2_BIN_PREFIX-mkimage
+
+if (which $GRUB2_BIN_PREFIX-setup > /dev/null 2>&1); then
+    GRUB2_SETUP=$GRUB2_BIN_PREFIX-setup
+elif (which $GRUB2_BIN_PREFIX-bios-setup > /dev/null 2>&1); then
+    GRUB2_SETUP=$GRUB2_BIN_PREFIX-bios-setup
+else
+    die "Konnte GRUB-setup-Tool nicht finden"
+fi
+
+
+convert_menu_lst()
+{
+    sed -ie 's/^title \(.*\)$/menuentry "\1" {/' "$1"
+    sed -ie 's/^kernel \([^ ]\+\)\(.*\)$/    multiboot \1 \1 \2/'  "$1"
+    sed -ie 's/^module \([^ ]\+\)\(.*\)$/    module \1 \1 \2/'  "$1"
+    sed -ie 's/^boot$/}/' "$1"
+    sed -ie 's/|/\\|/' "$1"
+}
+
+# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr
+# dazu.
+NEW=0
+if ! [ -f $IMAGE_PATH ]; then
+    # Leeres Image erstellen und formatieren
+    dd of=$IMAGE_PATH bs=$((1024 * 1024)) seek=$IMAGE_SIZE count=0
+    build/scripts/create_partition $IMAGE_PATH
+    NEW=1
+fi
+
+
+# Start und Ende der Partition einlesen
+PARTITIONS="`build/scripts/get_partition $IMAGE_PATH`"
+PART_START=`echo $PARTITIONS | awk '{print $1}'`
+PART_SIZE=`echo $PARTITIONS | awk '{print $2}'`
+
+if [ $NEW -ne 0 ]; then
+    LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --sizelimit $(($PART_SIZE * 512)) -o $(($PART_START * 512)) --show`
+    if [ $? -ne 0 ]; then
+        die "Loop Device konnte nicht angelegt werden"
+    fi
+
+    # Dateisystem erstellen
+    $SUDO $LOST_TOOLS_MKE2FS -T ext2 -F -q $LOOP_DEV || die "Dateisystem konnte nicht erstellt werden"
+
+    $SUDO losetup -d $LOOP_DEV
+fi
+
+LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --offset=$((${PART_START} * 512)) --show`
+if [ $? -ne 0 ]; then
+    die "Loop Device konnte nicht angelegt werden"
+fi
+
+# Partition mounten
+mkdir -p $MOUNT
+$SUDO mount $LOOP_DEV $MOUNT -t ext2
+$SUDO chmod 777 -R $MOUNT
+
+# Daten Kopieren
+cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/
+[ -d $ROOT_LOCAL ] && cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/
+
+# GRUB-Konfiguration kopieren
+mkdir -p $MOUNT/boot/grub
+rm -f $MOUNT/boot/grub/grub.cfg
+echo "insmod multiboot" >> $MOUNT/boot/grub/grub.cfg
+if [ -e $MOUNT/boot/tyndur2 ]; then
+	cat build/config/grub_usb_kernel2.cfg >> $MOUNT/boot/grub/grub.cfg
+fi
+if [ -e $MOUNT/boot/tyndur ]; then
+    cat build/config/grub_usb.cfg >> $MOUNT/boot/grub/grub.cfg
+fi
+
+convert_menu_lst $MOUNT/boot/grub/grub.cfg
+
+
+# Erstmal überlegen, welche Module wir dieses Mal brauchen könnten.
+# Die Abhänngigkeiten ändern sich leider zu häufig als dass man sich auf
+# eine feste Liste verlassen könnte.
+dependencies=""
+
+function list_dependencies()
+{
+    local dep
+    local i
+
+    for i in $1; do
+        if (echo $dependencies | grep " $i " > /dev/null); then
+            continue;
+        fi
+        dependencies="$dependencies $i "
+
+        dep=$(grep "$i:" $LOST_GRUB2_MODULESDIR/moddep.lst | \
+              sed -e 's/^.*: *//')
+        list_dependencies "$dep"
+    done
+}
+
+list_dependencies "normal multiboot gzio"
+
+# Grub kopieren
+if [ $NEW -ne 0 ]; then
+    ln -fs . $MOUNT/boot/grub/i386-pc
+    echo "$dependencies" | sed -e 's/ /\n/g' | xargs -isrc cp $LOST_GRUB2_MODULESDIR/src.mod $MOUNT/boot/grub
+fi
+
+# Grub installieren
+if [ $NEW -ne 0 ]; then
+    DISK_LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --show`
+    if [ $? -ne 0 ]; then
+        die "Loop Device konnte nicht angelegt werden"
+    fi
+
+    $SUDO chmod 666 $LOOP_DEV
+    $SUDO chmod 666 $DISK_LOOP_DEV
+
+    mkdir -p build/grub2
+    echo "(hd0) $DISK_LOOP_DEV" > build/grub2/device.map
+
+    cp $LOST_GRUB2_MODULESDIR/boot.img $MOUNT/boot/grub
+    $GRUB2_MKIMAGE --directory=$LOST_GRUB2_MODULESDIR --prefix="(hd0,1)/boot/grub/" -O i386-pc -o $MOUNT/boot/grub/core.img ext2 biosdisk part_msdos minicmd
+    $GRUB2_SETUP -m build/grub2/device.map -d $MOUNT/boot/grub "(hd0)"
+
+    $SUDO losetup -d $DISK_LOOP_DEV
+fi
+
+# Partition unmounten und loopback-Device freigeben
+while fuser -m $MOUNT; do true; done
+$SUDO umount $MOUNT
+rmdir $MOUNT
+
+$SUDO losetup -d $LOOP_DEV
diff --git a/buildmk.sh b/buildmk.sh
index abbd359..c900ef4 100644
--- a/buildmk.sh
+++ b/buildmk.sh
@@ -264,7 +264,7 @@ clean: clean_objs
 	for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done
 	rm -f Makefile.local
 
-.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd
+.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd image-usb test-qemu test-qemu-hd
 EOF
 
 # Auf alle Unterprozesse warten
-- 
2.6.3
References:
- [tyndur-devel] [PATCH 00/22] CDI.usb (und mehr)
  - From: Max Reitz
Prev by Date: [tyndur-devel] [PATCH 21/22] usb-storage: Add USB mass storage driver
Next by Date: Re: [tyndur-devel] [PATCH 02/11] kernel2: Neuer Syscall lio_probe_service
Previous by thread: [tyndur-devel] [PATCH 21/22] usb-storage: Add USB mass storage driver
Next by thread: [tyndur-devel] [PATCH v2 00/24] CDI.usb (und mehr)
Index(es):
- Date
- Thread