Attachment 888179 Details for Bug 1088933 – add --devtree support to extlinux

[patch] add --devtree support to extlinux

0001-Add-devtree-support-to-extlinux-1088933.patch (text/plain), 3.81 KB, created by Brian Lane on 2014-04-21 17:40:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Lane

Created: 2014-04-21 17:40:23 UTC

Size: 3.81 KB

patch

obsolete

>From b707cff9b171d256be30efced8ee43c672e974fa Mon Sep 17 00:00:00 2001
>From: "Brian C. Lane" <bcl@redhat.com>
>Date: Mon, 21 Apr 2014 10:30:11 -0700
>Subject: [PATCH] Add --devtree support to extlinux (#1088933)
>
>On 32 bit arm it needs the path to the dtb. This adds support for the
>fdtdir command to the extlinux handling. If --devtree /path/to/dtb/dir/
>is passed grubby will add or updated it.
>---
> grubby.c                     |  1 +
> test.sh                      |  5 +++++
> test/extlinux.5              | 21 +++++++++++++++++++++
> test/results/add/extlinux5.1 | 21 +++++++++++++++++++++
> 4 files changed, 48 insertions(+)
> create mode 100644 test/extlinux.5
> create mode 100644 test/results/add/extlinux5.1
>
>diff --git a/grubby.c b/grubby.c
>index 443d390..d55d4f0 100644
>--- a/grubby.c
>+++ b/grubby.c
>@@ -581,6 +581,7 @@ struct keywordTypes extlinuxKeywords[] = {
>     { "initrd",	    LT_INITRD,      ' ',	',' },
>     { "append",	    LT_KERNELARGS,  ' ' },
>     { "prompt",     LT_UNKNOWN,     ' ' },
>+    { "fdtdir",     LT_DEVTREE,     ' ' },
>     { NULL,	    0, 0 },
> };
> int useextlinuxmenu;
>diff --git a/test.sh b/test.sh
>index dbfb9c1..323a7dc 100755
>--- a/test.sh
>+++ b/test.sh
>@@ -642,6 +642,11 @@ extlinuxTest extlinux.2 add/extlinux2.1 --add-kernel=/boot/vmlinuz-3.12.0-2.fc21
>     --initrd=/boot/initrd-3.12.0-2.fc21.i686-new.img --boot-filesystem=/boot --copy-default \
>     --title="Fedora (3.12.0-2.fc21.i686) 20 (Heisenbug)"					    \
>     --remove-kernel="TITLE=Fedora (3.12.0-2.fc21.i686) 20 (Heisenbug)"
>+extlinuxTest extlinux.5 add/extlinux5.1 --add-kernel=/boot/vmlinuz-3.15.0-0.rc1.git4.1.fc21.armv7hl \
>+    --devtree='/boot/dtb-3.15.0-0.rc1.git4.1.fc21.armv7hl/' \
>+    --initrd=/boot/initramfs-3.15.0-0.rc1.git4.1.fc21.armv7hl.img --boot-filesystem=/boot --copy-default \
>+    --title="Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)" \
>+    --remove-kernel="TITLE=Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)"
> 
> testing="LILO long titles"
> liloTest lilo.1 longtitle/l1.1 --add-kernel=/boot/new-kernel.img \
>diff --git a/test/extlinux.5 b/test/extlinux.5
>new file mode 100644
>index 0000000..c28a4a8
>--- /dev/null
>+++ b/test/extlinux.5
>@@ -0,0 +1,21 @@
>+ui menu.c32
>+
>+menu hidden
>+timeout 50
>+totaltimeout 9000
>+
>+prompt 10
>+default Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)
>+
>+label Fedora (3.15.0-0.rc1.git0.1.fc21.armv7hl) 21 (Rawhide)
>+kernel /vmlinuz-3.15.0-0.rc1.git0.1.fc21.armv7hl
>+fdtdir /dtb-3.15.0-0.rc1.git0.1.fc21.armv7hl/
>+append console=ttymxc0,115200 root=UUID=7ee85ed8-de4a-4779-8658-2daed0d35e97 ro rhgb quiet LANG=en_US.UTF-8
>+initrd /initramfs-3.15.0-0.rc1.git0.1.fc21.armv7hl.img
>+
>+label Fedora (3.12.0-0.fc21.armv7hl) 21 (Rawhide)
>+kernel /vmlinuz-3.12.0-0.fc21.armv7hl
>+fdtdir /dtb-3.12.0-0.fc21.armv7hl/
>+append console=ttymxc0,115200 root=UUID=7ee85ed8-de4a-4779-8658-2daed0d35e97 ro rhgb quiet LANG=en_US.UTF-8
>+initrd /initramfs-3.12.0-0.fc21.armv7hl.img
>+
>diff --git a/test/results/add/extlinux5.1 b/test/results/add/extlinux5.1
>new file mode 100644
>index 0000000..ec2a2ea
>--- /dev/null
>+++ b/test/results/add/extlinux5.1
>@@ -0,0 +1,21 @@
>+ui menu.c32
>+
>+menu hidden
>+timeout 50
>+totaltimeout 9000
>+
>+prompt 10
>+default Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)
>+
>+label Fedora (3.15.0-0.rc1.git4.1.fc21.armv7hl) 21 (Rawhide)
>+kernel /vmlinuz-3.15.0-0.rc1.git4.1.fc21.armv7hl
>+fdtdir /dtb-3.15.0-0.rc1.git4.1.fc21.armv7hl/
>+append console=ttymxc0,115200 root=UUID=7ee85ed8-de4a-4779-8658-2daed0d35e97 ro rhgb quiet LANG=en_US.UTF-8
>+initrd /initramfs-3.15.0-0.rc1.git4.1.fc21.armv7hl.img
>+
>+label Fedora (3.15.0-0.rc1.git0.1.fc21.armv7hl) 21 (Rawhide)
>+kernel /vmlinuz-3.15.0-0.rc1.git0.1.fc21.armv7hl
>+fdtdir /dtb-3.15.0-0.rc1.git0.1.fc21.armv7hl/
>+append console=ttymxc0,115200 root=UUID=7ee85ed8-de4a-4779-8658-2daed0d35e97 ro rhgb quiet LANG=en_US.UTF-8
>+initrd /initramfs-3.15.0-0.rc1.git0.1.fc21.armv7hl.img
>+
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1088933: 888179 | 889181 | 913961 | 913962 | 946192 | 946193 | 946195