[grubby] Don't create "debug" entries yet.
Peter Jones
pjones at fedoraproject.org
Fri Oct 17 22:56:52 UTC 2014
commit ee984748a5d07c5871abbd329df35a35a91c2fab
Author: Peter Jones <pjones at redhat.com>
Date: Thu Oct 16 14:25:29 2014 -0400
Don't create "debug" entries yet.
This apparently interacts poorly with grub2-mkconfig's title generation
and causes weird errors, so it's not ready yet.
This commit also fixes some quoting errors in the dtbdir n-k-p code.
Resolves: rhbz#1153410
Resolves: rhbz#1088933
Signed-off-by: Peter Jones <pjones at redhat.com>
...st-the-last-element-of-indexVars-in-findE.patch | 4 +-
0002-Add-bls-test-harness-bits.patch | 84 +++---
...-fix-initrd-updating-when-multiboot-exist.patch | 4 +-
...htly-better-fib-about-default-bootloader-.patch | 4 +-
...emplate-actually-return-the-saved-default.patch | 4 +-
... => 0006-Revert-Add-bls-test-harness-bits.patch | 84 +++---
...-filtering-update-kernel-by-title-as-well.patch | 106 -------
0007-Always-error-check-getLineByType.patch | 32 ++
...ly-create-debug-entries-when-installing-k.patch | 310 --------------------
...8-Add-devtree-support-to-extlinux-1088933.patch | 79 ++---
0009-Always-error-check-getLineByType.patch | 62 ----
...-for-devicetree-directories-for-use-on-ar.patch | 64 ++--
...-handling-to-work-in-the-supported-usecas.patch | 34 +-
grubby.spec | 20 +-
14 files changed, 216 insertions(+), 675 deletions(-)
---
diff --git a/0001-Don-t-go-past-the-last-element-of-indexVars-in-findE.patch b/0001-Don-t-go-past-the-last-element-of-indexVars-in-findE.patch
index e73cfd6..616371c 100644
--- a/0001-Don-t-go-past-the-last-element-of-indexVars-in-findE.patch
+++ b/0001-Don-t-go-past-the-last-element-of-indexVars-in-findE.patch
@@ -1,7 +1,7 @@
-From 4dbf9c7e15420eb06540bb426bf36c434787e344 Mon Sep 17 00:00:00 2001
+From 639b9ab2462d4dddd8b8cff04e8db352cb6dc5d5 Mon Sep 17 00:00:00 2001
From: Yannick Brosseau <scientist at fb.com>
Date: Thu, 3 Jul 2014 13:55:19 -0700
-Subject: [PATCH 1/9] Don't go past the last element of indexVars in
+Subject: [PATCH 01/10] Don't go past the last element of indexVars in
findEntryByPath
We add a chance of creating an infinite loop, because we
diff --git a/0002-Add-bls-test-harness-bits.patch b/0002-Add-bls-test-harness-bits.patch
index 741f57e..e129e93 100644
--- a/0002-Add-bls-test-harness-bits.patch
+++ b/0002-Add-bls-test-harness-bits.patch
@@ -1,7 +1,7 @@
-From 98cab84501f86bd98f12653c11f4ecc632139399 Mon Sep 17 00:00:00 2001
+From 0e5c50b8dff5208b915391e3b592790bdf174cf4 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 8 Jul 2014 14:37:21 -0400
-Subject: [PATCH 2/9] Add bls test harness bits.
+Subject: [PATCH 02/10] Add bls test harness bits.
This expects that there are bls config files and that grubby knows how
to deal with them, which isn't at all true, and so the test case
@@ -153,64 +153,64 @@ index 864a8ce..e7be15f 100755
grub2DisplayTest grub2.2 defaultindex/0 --default-index
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
new file mode 100644
-index 0000000..e36a1fd
+index 0000000..84b2bdf
--- /dev/null
+++ b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
@@ -0,0 +1,8 @@
-+# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
-+title Fedora 19 (Rawhide)
-+version 3.8.0-2.fc19.x86_64
-+machine-id 6a9857a393724b7a981ebb5b8495b9ea
-+filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
-+linux /boot/vmlinux-3.8.0-2.fc19.x86_64
-+options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
-+initrd /boot/initrd-3.8.0-2.fc19.x86_64
++# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
++title Fedora 19 (Rawhide)
++version 3.8.0-2.fc19.x86_64
++machine-id 6a9857a393724b7a981ebb5b8495b9ea
++filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
++linux /boot/vmlinux-3.8.0-2.fc19.x86_64
++options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
++initrd /boot/initrd-3.8.0-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
new file mode 100644
-index 0000000..382d1af
+index 0000000..e1c61a8
--- /dev/null
+++ b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
@@ -0,0 +1,8 @@
-+# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
-+title Fedora 19 (Rawhide)
-+version 3.8.1-2.fc19.x86_64
-+machine-id 6a9857a393724b7a981ebb5b8495b9ea
-+filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
-+linux /boot/vmlinux-3.8.1-2.fc19.x86_64
-+options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
-+initrd /boot/initrd-3.8.1-2.fc19.x86_64
++# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
++title Fedora 19 (Rawhide)
++version 3.8.1-2.fc19.x86_64
++machine-id 6a9857a393724b7a981ebb5b8495b9ea
++filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
++linux /boot/vmlinux-3.8.1-2.fc19.x86_64
++options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
++initrd /boot/initrd-3.8.1-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
new file mode 100644
-index 0000000..05c0910
+index 0000000..4a60fbc
--- /dev/null
+++ b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
@@ -0,0 +1,10 @@
-+# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
-+title Fedora 19 (tboot) (Rawhide)
-+version 3.8.0-2.fc19.x86_64
-+machine-id 6a9857a393724b7a981ebb5b8495b9ea
-+filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
-+multiboot /boot/tboot.gz
-+ options logging=serial,vga,memory
-+linux /boot/vmlinux-3.8.0-2.fc19.x86_64
-+options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
-+initrd /boot/initrd-3.8.0-2.fc19.x86_64
++# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
++title Fedora 19 (tboot) (Rawhide)
++version 3.8.0-2.fc19.x86_64
++machine-id 6a9857a393724b7a981ebb5b8495b9ea
++filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
++multiboot /boot/tboot.gz
++ options logging=serial,vga,memory
++linux /boot/vmlinux-3.8.0-2.fc19.x86_64
++options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
++initrd /boot/initrd-3.8.0-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
new file mode 100644
-index 0000000..db17a93
+index 0000000..34c0e09
--- /dev/null
+++ b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
@@ -0,0 +1,10 @@
-+# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
-+title Fedora 19 (tboot) (Rawhide)
-+version 3.8.1-2.fc19.x86_64
-+machine-id 6a9857a393724b7a981ebb5b8495b9ea
-+filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
-+multiboot /boot/tboot.gz
-+ options logging=serial,vga,memory
-+linux /boot/vmlinux-3.8.1-2.fc19.x86_64
-+options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
-+initrd /boot/initrd-3.8.1-2.fc19.x86_64
++# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
++title Fedora 19 (tboot) (Rawhide)
++version 3.8.1-2.fc19.x86_64
++machine-id 6a9857a393724b7a981ebb5b8495b9ea
++filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
++multiboot /boot/tboot.gz
++ options logging=serial,vga,memory
++linux /boot/vmlinux-3.8.1-2.fc19.x86_64
++options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
++initrd /boot/initrd-3.8.1-2.fc19.x86_64
diff --git a/test/grub2.15 b/test/grub2.15
new file mode 100644
index 0000000..0be2d74
diff --git a/0003-grubby-fix-initrd-updating-when-multiboot-exist.patch b/0003-grubby-fix-initrd-updating-when-multiboot-exist.patch
index 660f251..2560743 100644
--- a/0003-grubby-fix-initrd-updating-when-multiboot-exist.patch
+++ b/0003-grubby-fix-initrd-updating-when-multiboot-exist.patch
@@ -1,7 +1,7 @@
-From 2f35781fde88a99dec22407057b1a46343bc00cc Mon Sep 17 00:00:00 2001
+From e91855ce14df65d12f681c15dfba5b22a2b4a061 Mon Sep 17 00:00:00 2001
From: Junxiao Bi <junxiao.bi at oracle.com>
Date: Wed, 14 May 2014 16:44:21 +0800
-Subject: [PATCH 3/9] grubby: fix initrd updating when multiboot exist
+Subject: [PATCH 03/10] grubby: fix initrd updating when multiboot exist
When using the following command to add an initrd for the kernel.
grubby --update-kernel=/boot/vmlinuz-2.6.32-431.17.1.el6.x86_64.debug
diff --git a/0004-Tell-a-slightly-better-fib-about-default-bootloader-.patch b/0004-Tell-a-slightly-better-fib-about-default-bootloader-.patch
index ffd3b86..6c0e91f 100644
--- a/0004-Tell-a-slightly-better-fib-about-default-bootloader-.patch
+++ b/0004-Tell-a-slightly-better-fib-about-default-bootloader-.patch
@@ -1,7 +1,7 @@
-From 338b08cb67a369069475f327b0fce74b506e5c46 Mon Sep 17 00:00:00 2001
+From dbd5b06ce590ca638e3c44746183f6f2379e820f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Fri, 12 Sep 2014 15:50:05 -0400
-Subject: [PATCH 4/9] Tell a slightly better fib about default bootloader
+Subject: [PATCH 04/10] Tell a slightly better fib about default bootloader
config paths.
It's not going to be right everywhere, but... whatever.
diff --git a/0005-Make-findTemplate-actually-return-the-saved-default.patch b/0005-Make-findTemplate-actually-return-the-saved-default.patch
index 4bcbb2a..ffa23c1 100644
--- a/0005-Make-findTemplate-actually-return-the-saved-default.patch
+++ b/0005-Make-findTemplate-actually-return-the-saved-default.patch
@@ -1,7 +1,7 @@
-From f631d090d3a78327e6d2642465be6ab559dd7f4e Mon Sep 17 00:00:00 2001
+From 629922b6dc32e4209980d7198b7d2aabb722033a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 15 Sep 2014 14:31:01 -0400
-Subject: [PATCH 5/9] Make findTemplate actually return the saved default.
+Subject: [PATCH 05/10] Make findTemplate actually return the saved default.
Really not sure why this wasn't returning here before; going into the
loop below is just going to clobber all that it's done.
diff --git a/0008-Revert-Add-bls-test-harness-bits.patch b/0006-Revert-Add-bls-test-harness-bits.patch
similarity index 98%
rename from 0008-Revert-Add-bls-test-harness-bits.patch
rename to 0006-Revert-Add-bls-test-harness-bits.patch
index 54af4f4..57aa733 100644
--- a/0008-Revert-Add-bls-test-harness-bits.patch
+++ b/0006-Revert-Add-bls-test-harness-bits.patch
@@ -1,7 +1,7 @@
-From 4b927a16d3a1a8356f4ceb78c7388ca3cb6a5d87 Mon Sep 17 00:00:00 2001
+From 0950d2e8693339a36f59c966dc8558263331665c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 15 Sep 2014 16:49:26 -0400
-Subject: [PATCH 8/9] Revert "Add bls test harness bits."
+Subject: [PATCH 06/10] Revert "Add bls test harness bits."
This wasn't supposed to be pushed to master yet. woops.
@@ -147,64 +147,64 @@ index e7be15f..864a8ce 100755
grub2DisplayTest grub2.2 defaultindex/0 --default-index
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
deleted file mode 100644
-index e36a1fd..0000000
+index 84b2bdf..0000000
--- a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
+++ /dev/null
@@ -1,8 +0,0 @@
--# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
--title Fedora 19 (Rawhide)
--version 3.8.0-2.fc19.x86_64
--machine-id 6a9857a393724b7a981ebb5b8495b9ea
--filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
--linux /boot/vmlinux-3.8.0-2.fc19.x86_64
--options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
--initrd /boot/initrd-3.8.0-2.fc19.x86_64
+-# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf
+-title Fedora 19 (Rawhide)
+-version 3.8.0-2.fc19.x86_64
+-machine-id 6a9857a393724b7a981ebb5b8495b9ea
+-filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
+-linux /boot/vmlinux-3.8.0-2.fc19.x86_64
+-options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
+-initrd /boot/initrd-3.8.0-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
deleted file mode 100644
-index 382d1af..0000000
+index e1c61a8..0000000
--- a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
+++ /dev/null
@@ -1,8 +0,0 @@
--# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
--title Fedora 19 (Rawhide)
--version 3.8.1-2.fc19.x86_64
--machine-id 6a9857a393724b7a981ebb5b8495b9ea
--filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
--linux /boot/vmlinux-3.8.1-2.fc19.x86_64
--options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
--initrd /boot/initrd-3.8.1-2.fc19.x86_64
+-# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.1-2.fc19.x86_64.conf
+-title Fedora 19 (Rawhide)
+-version 3.8.1-2.fc19.x86_64
+-machine-id 6a9857a393724b7a981ebb5b8495b9ea
+-filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
+-linux /boot/vmlinux-3.8.1-2.fc19.x86_64
+-options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
+-initrd /boot/initrd-3.8.1-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
deleted file mode 100644
-index 05c0910..0000000
+index 4a60fbc..0000000
--- a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
+++ /dev/null
@@ -1,10 +0,0 @@
--# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
--title Fedora 19 (tboot) (Rawhide)
--version 3.8.0-2.fc19.x86_64
--machine-id 6a9857a393724b7a981ebb5b8495b9ea
--filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
--multiboot /boot/tboot.gz
-- options logging=serial,vga,memory
--linux /boot/vmlinux-3.8.0-2.fc19.x86_64
--options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
--initrd /boot/initrd-3.8.0-2.fc19.x86_64
+-# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.0-2.fc19.x86_64.conf
+-title Fedora 19 (tboot) (Rawhide)
+-version 3.8.0-2.fc19.x86_64
+-machine-id 6a9857a393724b7a981ebb5b8495b9ea
+-filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
+-multiboot /boot/tboot.gz
+- options logging=serial,vga,memory
+-linux /boot/vmlinux-3.8.0-2.fc19.x86_64
+-options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
+-initrd /boot/initrd-3.8.0-2.fc19.x86_64
diff --git a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf b/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
deleted file mode 100644
-index db17a93..0000000
+index 34c0e09..0000000
--- a/test/grub2-support_files/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
+++ /dev/null
@@ -1,10 +0,0 @@
--# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
--title Fedora 19 (tboot) (Rawhide)
--version 3.8.1-2.fc19.x86_64
--machine-id 6a9857a393724b7a981ebb5b8495b9ea
--filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
--multiboot /boot/tboot.gz
-- options logging=serial,vga,memory
--linux /boot/vmlinux-3.8.1-2.fc19.x86_64
--options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
--initrd /boot/initrd-3.8.1-2.fc19.x86_64
+-# /boot/org/freedesktop/bls/entries/6a9857a393724b7a981ebb5b8495b9ea-tboot-3.8.1-2.fc19.x86_64.conf
+-title Fedora 19 (tboot) (Rawhide)
+-version 3.8.1-2.fc19.x86_64
+-machine-id 6a9857a393724b7a981ebb5b8495b9ea
+-filesystem 6d3376e4-fc93-4509-95ec-a21d68011da2
+-multiboot /boot/tboot.gz
+- options logging=serial,vga,memory
+-linux /boot/vmlinux-3.8.1-2.fc19.x86_64
+-options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2
+-initrd /boot/initrd-3.8.1-2.fc19.x86_64
diff --git a/test/grub2.15 b/test/grub2.15
deleted file mode 100644
index 0be2d74..0000000
diff --git a/0007-Always-error-check-getLineByType.patch b/0007-Always-error-check-getLineByType.patch
new file mode 100644
index 0000000..2ca4f7a
--- /dev/null
+++ b/0007-Always-error-check-getLineByType.patch
@@ -0,0 +1,32 @@
+From e3a293332591f44a190775a3b4dceefe2e5118a1 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Thu, 25 Sep 2014 13:24:15 -0400
+Subject: [PATCH 07/10] Always error check getLineByType()
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ grubby.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/grubby.c b/grubby.c
+index baf646b..b202b6e 100644
+--- a/grubby.c
++++ b/grubby.c
+@@ -2369,9 +2369,11 @@ void displayEntry(struct singleEntry * entry, const char * prefix, int index) {
+ } else {
+ char * title;
+ line = getLineByType(LT_MENUENTRY, entry->lines);
+- title = grub2ExtractTitle(line);
+- if (title)
+- printf("title=%s\n", title);
++ if (line) {
++ title = grub2ExtractTitle(line);
++ if (title)
++ printf("title=%s\n", title);
++ }
+ }
+
+ for (j = 0, line = entry->lines; line; line = line->next) {
+--
+1.9.3
+
diff --git a/0001-Add-devtree-support-to-extlinux-1088933.patch b/0008-Add-devtree-support-to-extlinux-1088933.patch
similarity index 69%
rename from 0001-Add-devtree-support-to-extlinux-1088933.patch
rename to 0008-Add-devtree-support-to-extlinux-1088933.patch
index 58cc844..1dd7ed3 100644
--- a/0001-Add-devtree-support-to-extlinux-1088933.patch
+++ b/0008-Add-devtree-support-to-extlinux-1088933.patch
@@ -1,23 +1,23 @@
-From aa7af717b8855bcfb9a95b80931b8ff319112b88 Mon Sep 17 00:00:00 2001
+From eb141563832f803abdfc1fde83fbfcc9031794b3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 10 Oct 2014 02:06:52 -0500
-Subject: [PATCH 1/3] Add --devtree support to extlinux (#1088933)
+Subject: [PATCH 08/10] Add --devtree support to extlinux (#1088933)
On 32 bit arm it needs the path to the dtb. This adds support for the
fdt command to the extlinux handling. If --devtree /path/to/dtb/file.dtb
is passed grubby will add or updated it.
---
grubby.c | 1 +
- new-kernel-pkg | 23 ++++++++++++++++++++---
+ new-kernel-pkg | 20 ++++++++++++++++++--
test.sh | 5 +++++
test/extlinux.5 | 21 +++++++++++++++++++++
test/results/add/extlinux5.1 | 21 +++++++++++++++++++++
- 5 files changed, 68 insertions(+), 3 deletions(-)
+ 5 files changed, 66 insertions(+), 2 deletions(-)
create mode 100644 test/extlinux.5
create mode 100644 test/results/add/extlinux5.1
diff --git a/grubby.c b/grubby.c
-index 27b4547..bbe54b6 100644
+index b202b6e..cbb1cca 100644
--- a/grubby.c
+++ b/grubby.c
@@ -581,6 +581,7 @@ struct keywordTypes extlinuxKeywords[] = {
@@ -29,36 +29,19 @@ index 27b4547..bbe54b6 100644
};
int useextlinuxmenu;
diff --git a/new-kernel-pkg b/new-kernel-pkg
-index 70f6118..9784f2b 100755
+index d9a9b67..0f21e39 100755
--- a/new-kernel-pkg
+++ b/new-kernel-pkg
-@@ -7,7 +7,7 @@
- # run of depmod/removal of depmod generated files
- # addition/removal of kernel images from grub/lilo configuration (via grubby)
- #
--# Copyright 2002-2008 Red Hat, Inc. All rights reserved.
-+# Copyright 2002-2014 Red Hat, Inc. All rights reserved.
- #
- # 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
-@@ -113,6 +113,7 @@ dracut=""
- dracuthostonly=""
- initrdfile=""
- devtreefile=""
-+devtreedir=""
- moddep=""
- verbose=""
- makedefault=""
-@@ -296,7 +297,7 @@ install() {
- [ -n "$verbose" ] && echo "adding $version to $extlinuxConfig"
+@@ -265,7 +265,7 @@ install() {
- ARGS="--extlinux -c $extlinuxConfig --add-kernel=$kernelImage \
-- $INITRD --copy-default --title \"$title\$debugtitle\" \
-+ $DEVTREE $INITRD --copy-default --title \"$title\$debugtitle\" \
- ${mbkernel:+--add-multiboot=\"$mbkernel\"} \
- ${mbargs:+--mbargs=\"$mbargs\"} \
- --args=\"root=$rootdevice $kernargs \$debugargs\" \
-@@ -449,6 +450,12 @@ update() {
+ $grubby --extlinux -c $extlinuxConfig \
+ --add-kernel=$kernelImage \
+- $INITRD --copy-default $makedefault --title "$title" \
++ $DEVTREE $INITRD --copy-default $makedefault --title "$title" \
+ ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \
+ --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$title"
+ else
+@@ -411,6 +411,12 @@ update() {
fi
fi
@@ -70,27 +53,27 @@ index 70f6118..9784f2b 100755
+
if [ -n "$cfgGrub" ]; then
[ -n "$verbose" ] && echo "updating $version from $grubConfig"
- ARGS="--grub -c $grubConfig --update-kernel=$kernelImage $INITRD \
-@@ -544,7 +551,7 @@ update() {
- if [ -n "$cfgExtlinux" ]; then
+ $grubby --grub -c $grubConfig \
+@@ -499,7 +505,7 @@ update() {
[ -n "$verbose" ] && echo "updating $version from $extlinuxConfig"
- ARGS="--extlinux -c $extlinuxConfig --update-kernel=$kernelImage \
-- $INITRD ${kernargs:+--args=\"$kernargs\"} \
-+ $DEVTREE $INITRD ${kernargs:+--args=\"$kernargs\"} \
- ${removeargs:+--remove-args=\"$removeargs\"} \
- --title=\"$title\$debugtitle\""
-
-@@ -772,6 +779,16 @@ if [ -z "$initrdfile" ]; then
+ $grubby --extlinux -c $extlinuxConfig \
+ --update-kernel=$kernelImage \
+- $INITRD \
++ $DEVTREE $INITRD \
+ ${kernargs:+--args="$kernargs"} \
+ ${removeargs:+--remove-args="$removeargs"}
+ else
+@@ -724,6 +730,16 @@ if [ -z "$initrdfile" ]; then
fi
[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+if [[ ${ARCH} =~ armv[5|7].*l ]]; then
-+ if [ -d "$bootPrefix/dtb-$version/" ]; then
-+ devtreedir="$bootPrefix/dtb-$version/"
-+ if [ -n "$dtbfile" -a -f "$devtreedir/$dtbfile" ]; then
-+ devtreefile="$devtreedir/$dtbfile"
++ if [ -d "$bootPrefix/dtb-$version/" ]; then
++ devtreedir="$bootPrefix/dtb-$version/"
++ if [ -n "$dtbfile" -a -f "$devtreedir/$dtbfile" ]; then
++ devtreefile="$devtreedir/$dtbfile"
++ fi
+ fi
-+ fi
+fi
+[ -n "$verbose" ] && echo "devtreedir is $devtreedir"
+
@@ -168,5 +151,5 @@ index 0000000..5e97883
+initrd /initramfs-3.15.0-0.rc1.git0.1.fc21.armv7hl.img
+
--
-2.1.0
+1.9.3
diff --git a/0002-add-support-for-devicetree-directories-for-use-on-ar.patch b/0009-add-support-for-devicetree-directories-for-use-on-ar.patch
similarity index 79%
rename from 0002-add-support-for-devicetree-directories-for-use-on-ar.patch
rename to 0009-add-support-for-devicetree-directories-for-use-on-ar.patch
index 2b218b6..0c64014 100644
--- a/0002-add-support-for-devicetree-directories-for-use-on-ar.patch
+++ b/0009-add-support-for-devicetree-directories-for-use-on-ar.patch
@@ -1,7 +1,7 @@
-From 1ea4401882f2863ae5c5313c3b28645c60fc93b3 Mon Sep 17 00:00:00 2001
+From 69dbfdc99ce993d541984f7305bb1206858f4bcf Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 10 Oct 2014 01:38:27 -0500
-Subject: [PATCH 2/3] add support for devicetree directories for use on arm
+Subject: [PATCH 09/10] add support for devicetree directories for use on arm
---
grubby.c | 3 +++
@@ -14,7 +14,7 @@ Subject: [PATCH 2/3] add support for devicetree directories for use on arm
create mode 100644 test/results/add/extlinux6.1
diff --git a/grubby.c b/grubby.c
-index bbe54b6..8a8df98 100644
+index cbb1cca..a4a9811 100644
--- a/grubby.c
+++ b/grubby.c
@@ -582,6 +582,7 @@ struct keywordTypes extlinuxKeywords[] = {
@@ -25,7 +25,7 @@ index bbe54b6..8a8df98 100644
{ NULL, 0, 0 },
};
int useextlinuxmenu;
-@@ -4269,6 +4270,8 @@ int main(int argc, const char ** argv) {
+@@ -4232,6 +4233,8 @@ int main(int argc, const char ** argv) {
_("display the title of the default kernel") },
{ "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
_("device tree file for new stanza"), _("dtb-path") },
@@ -35,10 +35,10 @@ index bbe54b6..8a8df98 100644
_("configure elilo bootloader") },
{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
diff --git a/new-kernel-pkg b/new-kernel-pkg
-index 9784f2b..8d55abf 100755
+index 0f21e39..31976a7 100755
--- a/new-kernel-pkg
+++ b/new-kernel-pkg
-@@ -131,7 +131,7 @@ usage() {
+@@ -128,7 +128,7 @@ usage() {
echo " [--banner=<banner>] [--multiboot=multiboot]" >&2
echo " [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
echo " [--add-plymouth-initrd]" >&2
@@ -47,18 +47,18 @@ index 9784f2b..8d55abf 100755
echo " <--install | --remove | --update | --rpmposttrans> <kernel-version>" >&2
echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
exit 1
-@@ -191,11 +191,17 @@ install() {
+@@ -153,11 +153,17 @@ install() {
fi
DEVTREE=""
- if [ "x$devtreefile" != "x" -a -f "$devtreefile" ]; then
-+ if [ -n $devtreefile -a -f "$devtreefile" ]; then
++ if [ -n "$devtreefile" -a -f "$devtreefile" ]; then
[ -n "$verbose" ] && echo "found $devtreefile and using it with grubby"
DEVTREE="--devtree $devtreefile"
fi
+ DEVTREEDIR=""
-+ if [ -n $devtreedir -a -d "$devtreedir" ]; then
++ if [ -n "$devtreedir" -a -d "$devtreedir" ]; then
+ [ -n "$verbose" ] && echo "found $devtreedir and using it with grubby"
+ DEVTREEDIR="--devtreedir $devtreedir"
+ fi
@@ -66,44 +66,44 @@ index 9784f2b..8d55abf 100755
# FIXME: is this a good heuristic to find out if we're on iSeries?
if [ -d /proc/iSeries ]; then
[ -n "$verbose" ] && echo "On an iSeries, just making img file"
-@@ -297,7 +303,7 @@ install() {
+@@ -264,7 +270,7 @@ install() {
[ -n "$verbose" ] && echo "adding $version to $extlinuxConfig"
- ARGS="--extlinux -c $extlinuxConfig --add-kernel=$kernelImage \
-- $DEVTREE $INITRD --copy-default --title \"$title\$debugtitle\" \
-+ $DEVTREE $DEVTREEDIR $INITRD --copy-default --title \"$title\$debugtitle\" \
- ${mbkernel:+--add-multiboot=\"$mbkernel\"} \
- ${mbargs:+--mbargs=\"$mbargs\"} \
- --args=\"root=$rootdevice $kernargs \$debugargs\" \
-@@ -451,11 +457,17 @@ update() {
+ $grubby --extlinux -c $extlinuxConfig \
+- --add-kernel=$kernelImage \
++ --add-kernel=$kernelImage $DEVTREEDIR \
+ $DEVTREE $INITRD --copy-default $makedefault --title "$title" \
+ ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \
+ --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$title"
+@@ -412,11 +418,17 @@ update() {
fi
DEVTREE=""
- if [ "x$devtreefile" != "x" -a -f "$devtreefile" ]; then
-+ if [ -n $devtreefile -a -f "$devtreefile" ]; then
++ if [ -n "$devtreefile" -a -f "$devtreefile" ]; then
[ -n "$verbose" ] && echo "found $devtreefile and using it with grubby"
DEVTREE="--devtree $devtreefile"
fi
+ DEVTREEDIR=""
-+ if [ -n $devtreedir -a -d "$devtreedir" ]; then
-+ [ -n "$verbose" ] && echo "found $devtreedir and using it with grubby"
-+ DEVTREEDIR="--devtreedir $devtreedir"
++ if [ -n "$devtreedir" -a -d "$devtreedir" ]; then
++ [ -n "$verbose" ] && echo "found $devtreedir and using it with grubby"
++ DEVTREEDIR="--devtreedir $devtreedir"
+ fi
+
if [ -n "$cfgGrub" ]; then
[ -n "$verbose" ] && echo "updating $version from $grubConfig"
- ARGS="--grub -c $grubConfig --update-kernel=$kernelImage $INITRD \
-@@ -551,7 +563,7 @@ update() {
- if [ -n "$cfgExtlinux" ]; then
+ $grubby --grub -c $grubConfig \
+@@ -505,7 +517,7 @@ update() {
[ -n "$verbose" ] && echo "updating $version from $extlinuxConfig"
- ARGS="--extlinux -c $extlinuxConfig --update-kernel=$kernelImage \
-- $DEVTREE $INITRD ${kernargs:+--args=\"$kernargs\"} \
-+ $DEVTREE $DEVTREEDIR $INITRD ${kernargs:+--args=\"$kernargs\"} \
- ${removeargs:+--remove-args=\"$removeargs\"} \
- --title=\"$title\$debugtitle\""
-
-@@ -615,6 +627,15 @@ while [ $# -gt 0 ]; do
+ $grubby --extlinux -c $extlinuxConfig \
+ --update-kernel=$kernelImage \
+- $DEVTREE $INITRD \
++ $DEVTREE $DEVTREEDIR $INITRD \
+ ${kernargs:+--args="$kernargs"} \
+ ${removeargs:+--remove-args="$removeargs"}
+ else
+@@ -566,6 +578,15 @@ while [ $# -gt 0 ]; do
fi
;;
@@ -190,5 +190,5 @@ index 0000000..ec2a2ea
+initrd /initramfs-3.15.0-0.rc1.git0.1.fc21.armv7hl.img
+
--
-2.1.0
+1.9.3
diff --git a/0003-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch b/0010-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
similarity index 60%
rename from 0003-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
rename to 0010-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
index e113fc3..1dd031f 100644
--- a/0003-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
+++ b/0010-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
@@ -1,7 +1,7 @@
-From 595f8d2d3681d684dbb12eff32bf1a68636db977 Mon Sep 17 00:00:00 2001
+From 354c873f633db124d214da8a1258e32fe210c7cb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 9 Oct 2014 01:42:03 -0500
-Subject: [PATCH 3/3] cleanup dtb handling to work in the supported usecases
+Subject: [PATCH 10/10] cleanup dtb handling to work in the supported usecases
add SHIPSDTB variable in the uboot defaults file that needs to be set to yes for
platforms like the calxeda highbank that ship a dtb in u-boot that we want to use.
@@ -13,26 +13,26 @@ with an fdt entry otherwise update a fdtdir entry unless SHIPSDTB is set to yes.
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/new-kernel-pkg b/new-kernel-pkg
-index 8d55abf..e02f65c 100755
+index 31976a7..311deda 100755
--- a/new-kernel-pkg
+++ b/new-kernel-pkg
-@@ -801,14 +801,16 @@ fi
+@@ -752,14 +752,16 @@ fi
[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
if [[ ${ARCH} =~ armv[5|7].*l ]]; then
-- if [ -d "$bootPrefix/dtb-$version/" ]; then
-- devtreedir="$bootPrefix/dtb-$version/"
-- if [ -n "$dtbfile" -a -f "$devtreedir/$dtbfile" ]; then
-- devtreefile="$devtreedir/$dtbfile"
-+ if [ -z "$SHIPSDTB" -o "$SHIPSDTB" != "yes" ]; then
-+ if [ -n "$dtbfile" -a -f "$bootPrefix/dtb-$version/$dtbfile" ]; then
-+ devtreefile="$bootPrefix/dtb-$version/$dtbfile"
-+ [ -n "$verbose" ] && echo "devtreefile is $devtreefile"
-+ elif [ -d "$bootPrefix/dtb-$version/" ]; then
-+ devtreedir="$bootPrefix/dtb-$version/"
-+ [ -n "$verbose" ] && echo "devtreedir is $devtreedir"
+- if [ -d "$bootPrefix/dtb-$version/" ]; then
+- devtreedir="$bootPrefix/dtb-$version/"
+- if [ -n "$dtbfile" -a -f "$devtreedir/$dtbfile" ]; then
+- devtreefile="$devtreedir/$dtbfile"
++ if [ -z "$SHIPSDTB" -o "$SHIPSDTB" != "yes" ]; then
++ if [ -n "$dtbfile" -a -f "$bootPrefix/dtb-$version/$dtbfile" ]; then
++ devtreefile="$bootPrefix/dtb-$version/$dtbfile"
++ [ -n "$verbose" ] && echo "devtreefile is $devtreefile"
++ elif [ -d "$bootPrefix/dtb-$version/" ]; then
++ devtreedir="$bootPrefix/dtb-$version/"
++ [ -n "$verbose" ] && echo "devtreedir is $devtreedir"
+ fi
fi
- fi
fi
-[ -n "$verbose" ] && echo "devtreedir is $devtreedir"
@@ -52,5 +52,5 @@ index aa663ad..07d8671 100644
+# option to tell new-kernel-pkg a specific dtb file to load in extlinux.conf
+#dtbfile=foo.dtb
--
-2.1.0
+1.9.3
diff --git a/grubby.spec b/grubby.spec
index 7026be8..f95738a 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
Name: grubby
Version: 8.35
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Command line tool for updating bootloader configs
Group: System Environment/Base
License: GPLv2+
@@ -14,13 +14,11 @@ Patch0002: 0002-Add-bls-test-harness-bits.patch
Patch0003: 0003-grubby-fix-initrd-updating-when-multiboot-exist.patch
Patch0004: 0004-Tell-a-slightly-better-fib-about-default-bootloader-.patch
Patch0005: 0005-Make-findTemplate-actually-return-the-saved-default.patch
-Patch0006: 0006-Support-filtering-update-kernel-by-title-as-well.patch
-Patch0007: 0007-Conditionally-create-debug-entries-when-installing-k.patch
-Patch0008: 0008-Revert-Add-bls-test-harness-bits.patch
-Patch0009: 0009-Always-error-check-getLineByType.patch
-Patch0010: 0001-Add-devtree-support-to-extlinux-1088933.patch
-Patch0011: 0002-add-support-for-devicetree-directories-for-use-on-ar.patch
-Patch0012: 0003-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
+Patch0006: 0006-Revert-Add-bls-test-harness-bits.patch
+Patch0007: 0007-Always-error-check-getLineByType.patch
+Patch0008: 0008-Add-devtree-support-to-extlinux-1088933.patch
+Patch0009: 0009-add-support-for-devicetree-directories-for-use-on-ar.patch
+Patch0010: 0010-cleanup-dtb-handling-to-work-in-the-supported-usecas.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig glib2-devel popt-devel
@@ -90,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Oct 16 2014 Peter Jones <pjones at redhat.com> - 8.35-7
+- Revert "debug" image creation for now
+ Resolves: rhbz#1153410
+- Fix minor quoting errors in dtbdir code
+ Resolves: rhbz#1088933
+
* Wed Oct 15 2014 Peter Jones <pjones at redhat.com> - 8.35-6
- Update grubby to support device tree options for arm. Again.
Resolves: rhbz#1088933
More information about the scm-commits
mailing list