diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2023-01-03 17:02:21 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-01-04 15:33:58 -0800 |
commit | eefad4d27a4578e56bc686b6aa0306e4ec5491c0 (patch) | |
tree | 71c957e6886773cdc10b0d60dd0ac656d7592f26 /meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch | |
parent | 29abac4415ca21de10e80cca7fd4a87ca76b8f03 (diff) | |
download | meta-openembedded-eefad4d27a4578e56bc686b6aa0306e4ec5491c0.tar.gz |
grubby: update to latest git rev
* Refresh patches.
* Update SRC_URI. The upstrem repository has been archived.
* Depends on rpm to rpm-sort build.
* Add a patch to fix rpm-sort build error.
* Do not specify PREFIX as the issue has been fixed upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch')
-rw-r--r-- | meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch b/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch deleted file mode 100644 index e693916e1..000000000 --- a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From 15f0572f2f456c2c1b700bc790d9ce7a5c13cc74 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Tue, 4 Aug 2015 23:54:41 -0700 | ||
4 | Subject: [PATCH] rename grub2-editenv to grub-editenv | ||
5 | |||
6 | We don't use the name grub2-editenv for grub2. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
11 | |||
12 | --- | ||
13 | grubby.c | 4 ++-- | ||
14 | test.sh | 8 ++++---- | ||
15 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/grubby.c b/grubby.c | ||
18 | index 396041a..3ceae69 100644 | ||
19 | --- a/grubby.c | ||
20 | +++ b/grubby.c | ||
21 | @@ -301,7 +301,7 @@ static char *grub2GetEnv(struct configFileInfo *info, char *name) | ||
22 | char *ret = NULL; | ||
23 | char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv"; | ||
24 | int rc = | ||
25 | - asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name); | ||
26 | + asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); | ||
27 | |||
28 | if (rc < 0) | ||
29 | return NULL; | ||
30 | @@ -373,7 +373,7 @@ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) | ||
31 | if (!value) | ||
32 | return -1; | ||
33 | |||
34 | - rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value); | ||
35 | + rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); | ||
36 | free(value); | ||
37 | if (rc < 0) | ||
38 | return -1; | ||
39 | diff --git a/test.sh b/test.sh | ||
40 | index 33d24cf..009479c 100755 | ||
41 | --- a/test.sh | ||
42 | +++ b/test.sh | ||
43 | @@ -573,7 +573,7 @@ if [ "$testgrub2" == "y" ]; then | ||
44 | --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \ | ||
45 | --boot-filesystem=/boot/ | ||
46 | commandTest "saved_default output" \ | ||
47 | - "grub2-editenv test/grub2-support_files/env_temp list" \ | ||
48 | + "grub-editenv test/grub2-support_files/env_temp list" \ | ||
49 | "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" | ||
50 | |||
51 | # copy a stanza and add arguments as well, while using --set-index= | ||
52 | @@ -627,7 +627,7 @@ if [ "$testgrub2" == "y" ]; then | ||
53 | --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \ | ||
54 | --copy-default | ||
55 | commandTest "saved_default output" \ | ||
56 | - "grub2-editenv test/grub2-support_files/env_temp list" \ | ||
57 | + "grub-editenv test/grub2-support_files/env_temp list" \ | ||
58 | "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" | ||
59 | |||
60 | testing="GRUB2 add kernel with default=saved_entry and a terrible title" | ||
61 | @@ -640,13 +640,13 @@ if [ "$testgrub2" == "y" ]; then | ||
62 | testing="GRUB2 set default with default=saved_entry and a terrible name" | ||
63 | grub2Test grub2.9 add/g2-1.9 --env grubenv.1 --set-default-index=0 | ||
64 | commandTest "saved_default output" \ | ||
65 | - "grub2-editenv test/grub2-support_files/env_temp list" \ | ||
66 | + "grub-editenv test/grub2-support_files/env_temp list" \ | ||
67 | 'saved_entry=Fedora (3.10.3-300.fc19.x86_64) 19 (Schrödinger’s Cat)' | ||
68 | |||
69 | testing="GRUB2 set default with default=saved_entry" | ||
70 | grub2Test grub2.8 add/g2-1.8 --env grubenv.1 --set-default-index=0 | ||
71 | commandTest "saved_default output" \ | ||
72 | - "grub2-editenv test/grub2-support_files/env_temp list" \ | ||
73 | + "grub-editenv test/grub2-support_files/env_temp list" \ | ||
74 | "saved_entry=title" | ||
75 | |||
76 | testing="GRUB2 --default-index with default=saved_entry" | ||