diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-08-06 14:09:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-10 08:33:45 +0100 |
commit | b1c27d69f67beea53f606388c2d69484b5dd5b63 (patch) | |
tree | f02e19555c82545583e3f6fb0ba76f38634b73aa /meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch | |
parent | 7fea5b909e74acbfa36b107d3bc28daa16e1c449 (diff) | |
download | poky-b1c27d69f67beea53f606388c2d69484b5dd5b63.tar.gz |
syslinux: refresh patches with devtool
* add git headers so that all can be applied with git am
(From OE-Core rev: 22fdcdd217b8d5bd4c8e418566302cdafa219e9a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch')
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch b/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch index 47a8dac10e..1a4a4e3755 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 60f3833ab2b5899771b4eab654e88f9888b99501 Mon Sep 17 00:00:00 2001 | 1 | From a469ce05055c44fdca1ca094ff3a735cc059480d Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Wed, 31 Dec 2014 16:01:55 +0800 | 3 | Date: Wed, 31 Dec 2014 16:01:55 +0800 |
4 | Subject: [PATCH 1/9] linux/syslinux: support ext2/3/4 device | 4 | Subject: [PATCH] linux/syslinux: support ext2/3/4 device |
5 | 5 | ||
6 | * Support ext2/3/4 deivce. | 6 | * Support ext2/3/4 deivce. |
7 | * The open_ext2_fs() checks whether it is an ext2/3/4 device, | 7 | * The open_ext2_fs() checks whether it is an ext2/3/4 device, |
@@ -19,10 +19,10 @@ Tested-by: Du Dolpher <dolpher.du@intel.com> | |||
19 | 1 file changed, 36 insertions(+) | 19 | 1 file changed, 36 insertions(+) |
20 | 20 | ||
21 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 21 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
22 | index 912de71..36fc202 100755 | 22 | index 46d5624..1cc276b 100755 |
23 | --- a/linux/syslinux.c | 23 | --- a/linux/syslinux.c |
24 | +++ b/linux/syslinux.c | 24 | +++ b/linux/syslinux.c |
25 | @@ -256,6 +256,23 @@ int do_open_file(char *name) | 25 | @@ -257,6 +257,23 @@ int do_open_file(char *name) |
26 | return fd; | 26 | return fd; |
27 | } | 27 | } |
28 | 28 | ||
@@ -46,7 +46,7 @@ index 912de71..36fc202 100755 | |||
46 | int main(int argc, char *argv[]) | 46 | int main(int argc, char *argv[]) |
47 | { | 47 | { |
48 | static unsigned char sectbuf[SECTOR_SIZE]; | 48 | static unsigned char sectbuf[SECTOR_SIZE]; |
49 | @@ -313,6 +330,24 @@ int main(int argc, char *argv[]) | 49 | @@ -314,6 +331,24 @@ int main(int argc, char *argv[]) |
50 | die("can't combine an offset with a block device"); | 50 | die("can't combine an offset with a block device"); |
51 | } | 51 | } |
52 | 52 | ||
@@ -71,7 +71,7 @@ index 912de71..36fc202 100755 | |||
71 | xpread(dev_fd, sectbuf, SECTOR_SIZE, opt.offset); | 71 | xpread(dev_fd, sectbuf, SECTOR_SIZE, opt.offset); |
72 | fsync(dev_fd); | 72 | fsync(dev_fd); |
73 | 73 | ||
74 | @@ -322,6 +357,7 @@ int main(int argc, char *argv[]) | 74 | @@ -323,6 +358,7 @@ int main(int argc, char *argv[]) |
75 | */ | 75 | */ |
76 | if ((errmsg = syslinux_check_bootsect(sectbuf, &fs_type))) { | 76 | if ((errmsg = syslinux_check_bootsect(sectbuf, &fs_type))) { |
77 | fprintf(stderr, "%s: %s\n", opt.device, errmsg); | 77 | fprintf(stderr, "%s: %s\n", opt.device, errmsg); |
@@ -79,6 +79,3 @@ index 912de71..36fc202 100755 | |||
79 | exit(1); | 79 | exit(1); |
80 | } | 80 | } |
81 | 81 | ||
82 | -- | ||
83 | 1.9.1 | ||
84 | |||