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 | |
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')
16 files changed, 115 insertions, 112 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 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch b/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch index 77cf060451..1acd9b0b69 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 07fb737fb60c08eaaa41989d531fc23009523546 Mon Sep 17 00:00:00 2001 | 1 | From c6ddb179577dd4c4ea4d1d154f979e90e53d6bf1 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:09:18 +0800 | 3 | Date: Wed, 31 Dec 2014 16:09:18 +0800 |
4 | Subject: [PATCH 2/9] linux/syslinux: implement open_ext2_fs() | 4 | Subject: [PATCH] linux/syslinux: implement open_ext2_fs() |
5 | 5 | ||
6 | The open_ext2_fs() checks whether it is an ext2/ext3/ext4 device, and | 6 | The open_ext2_fs() checks whether it is an ext2/ext3/ext4 device, and |
7 | return: | 7 | return: |
@@ -15,14 +15,14 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
15 | Tested-by: Du Dolpher <dolpher.du@intel.com> | 15 | Tested-by: Du Dolpher <dolpher.du@intel.com> |
16 | --- | 16 | --- |
17 | linux/Makefile | 2 +- | 17 | linux/Makefile | 2 +- |
18 | linux/syslinux.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 18 | linux/syslinux.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ |
19 | 2 files changed, 81 insertions(+), 1 deletion(-) | 19 | 2 files changed, 81 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/linux/Makefile b/linux/Makefile | 21 | diff --git a/linux/Makefile b/linux/Makefile |
22 | index 11667e1..ac1ac58 100644 | 22 | index 5a49d81..67cbbb4 100644 |
23 | --- a/linux/Makefile | 23 | --- a/linux/Makefile |
24 | +++ b/linux/Makefile | 24 | +++ b/linux/Makefile |
25 | @@ -51,7 +51,7 @@ spotless: clean | 25 | @@ -52,7 +52,7 @@ spotless: clean |
26 | installer: syslinux syslinux-nomtools | 26 | installer: syslinux syslinux-nomtools |
27 | 27 | ||
28 | syslinux: $(OBJS) | 28 | syslinux: $(OBJS) |
@@ -32,10 +32,10 @@ index 11667e1..ac1ac58 100644 | |||
32 | syslinux-nomtools: syslinux | 32 | syslinux-nomtools: syslinux |
33 | ln -f $< $@ | 33 | ln -f $< $@ |
34 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 34 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
35 | index 36fc202..cc4e7da 100755 | 35 | index 1cc276b..f3727ea 100755 |
36 | --- a/linux/syslinux.c | 36 | --- a/linux/syslinux.c |
37 | +++ b/linux/syslinux.c | 37 | +++ b/linux/syslinux.c |
38 | @@ -72,6 +72,7 @@ | 38 | @@ -73,6 +73,7 @@ |
39 | #include "syslxfs.h" | 39 | #include "syslxfs.h" |
40 | #include "setadv.h" | 40 | #include "setadv.h" |
41 | #include "syslxopt.h" /* unified options */ | 41 | #include "syslxopt.h" /* unified options */ |
@@ -43,7 +43,7 @@ index 36fc202..cc4e7da 100755 | |||
43 | 43 | ||
44 | extern const char *program; /* Name of program */ | 44 | extern const char *program; /* Name of program */ |
45 | 45 | ||
46 | @@ -82,6 +83,9 @@ char *mntpath = NULL; /* Path on which to mount */ | 46 | @@ -83,6 +84,9 @@ char *mntpath = NULL; /* Path on which to mount */ |
47 | int loop_fd = -1; /* Loop device */ | 47 | int loop_fd = -1; /* Loop device */ |
48 | #endif | 48 | #endif |
49 | 49 | ||
@@ -53,7 +53,7 @@ index 36fc202..cc4e7da 100755 | |||
53 | void __attribute__ ((noreturn)) die(const char *msg) | 53 | void __attribute__ ((noreturn)) die(const char *msg) |
54 | { | 54 | { |
55 | fprintf(stderr, "%s: %s\n", program, msg); | 55 | fprintf(stderr, "%s: %s\n", program, msg); |
56 | @@ -266,6 +270,82 @@ int do_open_file(char *name) | 56 | @@ -267,6 +271,82 @@ int do_open_file(char *name) |
57 | */ | 57 | */ |
58 | static int open_ext2_fs(const char *device, const char *subdir) | 58 | static int open_ext2_fs(const char *device, const char *subdir) |
59 | { | 59 | { |
@@ -136,6 +136,3 @@ index 36fc202..cc4e7da 100755 | |||
136 | } | 136 | } |
137 | 137 | ||
138 | /* The install func for ext2, ext3 and ext4 */ | 138 | /* The install func for ext2, ext3 and ext4 */ |
139 | -- | ||
140 | 1.9.1 | ||
141 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch b/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch index 84ba10526a..8d2fef2d49 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 64d856b243812907068776b204a003a3a8fa122a Mon Sep 17 00:00:00 2001 | 1 | From 9110cf47d04ca1958d14228908a5c57a23769e7d 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:17:42 +0800 | 3 | Date: Wed, 31 Dec 2014 16:17:42 +0800 |
4 | Subject: [PATCH 3/9] linux/syslinux: implement install_to_ext2() | 4 | Subject: [PATCH] linux/syslinux: implement install_to_ext2() |
5 | 5 | ||
6 | * The handle_adv_on_ext() checks whether we only need update adv. | 6 | * The handle_adv_on_ext() checks whether we only need update adv. |
7 | * The write_to_ext() installs files (ldlinux.sys or ldlinux.c32) to the | 7 | * The write_to_ext() installs files (ldlinux.sys or ldlinux.c32) to the |
@@ -13,14 +13,14 @@ Upstream-Status: Submitted | |||
13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
14 | Tested-by: Du Dolpher <dolpher.du@intel.com> | 14 | Tested-by: Du Dolpher <dolpher.du@intel.com> |
15 | --- | 15 | --- |
16 | linux/syslinux.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 16 | linux/syslinux.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ |
17 | 1 file changed, 79 insertions(+) | 17 | 1 file changed, 79 insertions(+) |
18 | 18 | ||
19 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 19 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
20 | index cc4e7da..45f080d 100755 | 20 | index f3727ea..fc5edb1 100755 |
21 | --- a/linux/syslinux.c | 21 | --- a/linux/syslinux.c |
22 | +++ b/linux/syslinux.c | 22 | +++ b/linux/syslinux.c |
23 | @@ -346,11 +346,90 @@ static int open_ext2_fs(const char *device, const char *subdir) | 23 | @@ -347,11 +347,90 @@ static int open_ext2_fs(const char *device, const char *subdir) |
24 | fail: | 24 | fail: |
25 | (void) ext2fs_close(e2fs); | 25 | (void) ext2fs_close(e2fs); |
26 | return -1; | 26 | return -1; |
@@ -111,6 +111,3 @@ index cc4e7da..45f080d 100755 | |||
111 | } | 111 | } |
112 | 112 | ||
113 | int main(int argc, char *argv[]) | 113 | int main(int argc, char *argv[]) |
114 | -- | ||
115 | 1.9.1 | ||
116 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch b/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch index 64b56d92e0..0a32969154 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 35d3842cc4b930c5102eed2921e0189b7f4fd069 Mon Sep 17 00:00:00 2001 | 1 | From 1957fc6c069493c6789557936adb675f5e7e51ba 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:43:37 +0800 | 3 | Date: Wed, 31 Dec 2014 16:43:37 +0800 |
4 | Subject: [PATCH 4/9] linux/syslinux: add ext_file_read() and ext_file_write() | 4 | Subject: [PATCH] linux/syslinux: add ext_file_read() and ext_file_write() |
5 | 5 | ||
6 | Will use them to read and write on the extX device. | 6 | Will use them to read and write on the extX device. |
7 | 7 | ||
@@ -10,14 +10,14 @@ Upstream-Status: Submitted | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
11 | Tested-by: Du Dolpher <dolpher.du@intel.com> | 11 | Tested-by: Du Dolpher <dolpher.du@intel.com> |
12 | --- | 12 | --- |
13 | linux/syslinux.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 13 | linux/syslinux.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ |
14 | 1 file changed, 62 insertions(+) | 14 | 1 file changed, 62 insertions(+) |
15 | 15 | ||
16 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 16 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
17 | index 45f080d..247c86a 100755 | 17 | index fc5edb1..c7c1994 100755 |
18 | --- a/linux/syslinux.c | 18 | --- a/linux/syslinux.c |
19 | +++ b/linux/syslinux.c | 19 | +++ b/linux/syslinux.c |
20 | @@ -349,6 +349,68 @@ fail: | 20 | @@ -350,6 +350,68 @@ fail: |
21 | 21 | ||
22 | } | 22 | } |
23 | 23 | ||
@@ -86,6 +86,3 @@ index 45f080d..247c86a 100755 | |||
86 | /* | 86 | /* |
87 | * Install the boot block on the specified device. | 87 | * Install the boot block on the specified device. |
88 | * Must be run AFTER file installed. | 88 | * Must be run AFTER file installed. |
89 | -- | ||
90 | 1.9.1 | ||
91 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch b/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch index 829e7c4ca1..76885f762b 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cdb980b37f40dc2c41891434c7736e49da53756e Mon Sep 17 00:00:00 2001 | 1 | From ee3a60829edc9d3344dc872fb0158e7b006f02be 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:47:52 +0800 | 3 | Date: Wed, 31 Dec 2014 16:47:52 +0800 |
4 | Subject: [PATCH 5/9] linux/syslinux: implement handle_adv_on_ext() | 4 | Subject: [PATCH] linux/syslinux: implement handle_adv_on_ext() |
5 | 5 | ||
6 | It reads adv if found on the device, or resets syslinux_adv, or update | 6 | It reads adv if found on the device, or resets syslinux_adv, or update |
7 | the adv if update adv only. | 7 | the adv if update adv only. |
@@ -11,14 +11,14 @@ Upstream-Status: Submitted | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
12 | Tested-by: Du Dolpher <dolpher.du@intel.com> | 12 | Tested-by: Du Dolpher <dolpher.du@intel.com> |
13 | --- | 13 | --- |
14 | linux/syslinux.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 14 | linux/syslinux.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ |
15 | 1 file changed, 97 insertions(+) | 15 | 1 file changed, 97 insertions(+) |
16 | 16 | ||
17 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 17 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
18 | index 247c86a..de5d272 100755 | 18 | index c7c1994..90b8edd 100755 |
19 | --- a/linux/syslinux.c | 19 | --- a/linux/syslinux.c |
20 | +++ b/linux/syslinux.c | 20 | +++ b/linux/syslinux.c |
21 | @@ -421,6 +421,103 @@ int install_bootblock(int fd, const char *device) | 21 | @@ -422,6 +422,103 @@ int install_bootblock(int fd, const char *device) |
22 | 22 | ||
23 | static int handle_adv_on_ext(void) | 23 | static int handle_adv_on_ext(void) |
24 | { | 24 | { |
@@ -122,6 +122,3 @@ index 247c86a..de5d272 100755 | |||
122 | } | 122 | } |
123 | 123 | ||
124 | /* Write files, adv, boot sector */ | 124 | /* Write files, adv, boot sector */ |
125 | -- | ||
126 | 1.9.1 | ||
127 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch b/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch index cba87252a5..ba6d29d3bb 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 922e56c10e36d876777580c84daef9a66bea6525 Mon Sep 17 00:00:00 2001 | 1 | From 758731ce2432ab29a73505bbeb99a960996ab686 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 17:20:43 +0800 | 3 | Date: Wed, 31 Dec 2014 17:20:43 +0800 |
4 | Subject: [PATCH 6/9] linux/syslinux: implement write_to_ext() and add | 4 | Subject: [PATCH] linux/syslinux: implement write_to_ext() and add |
5 | syslinuxext.c | 5 | syslinuxext.c |
6 | 6 | ||
7 | * The write_to_ext() write file to the extX device, and handle the boot | 7 | * The write_to_ext() write file to the extX device, and handle the boot |
@@ -17,7 +17,7 @@ Tested-by: Du Dolpher <dolpher.du@intel.com> | |||
17 | libinstaller/syslinuxext.c | 7 +++ | 17 | libinstaller/syslinuxext.c | 7 +++ |
18 | libinstaller/syslinuxext.h | 5 ++ | 18 | libinstaller/syslinuxext.h | 5 ++ |
19 | linux/Makefile | 3 +- | 19 | linux/Makefile | 3 +- |
20 | linux/syslinux.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ | 20 | linux/syslinux.c | 118 +++++++++++++++++++++++++++++++++++++ |
21 | 4 files changed, 132 insertions(+), 1 deletion(-) | 21 | 4 files changed, 132 insertions(+), 1 deletion(-) |
22 | create mode 100644 libinstaller/syslinuxext.c | 22 | create mode 100644 libinstaller/syslinuxext.c |
23 | create mode 100644 libinstaller/syslinuxext.h | 23 | create mode 100644 libinstaller/syslinuxext.h |
@@ -47,10 +47,10 @@ index 0000000..8abd8b9 | |||
47 | + | 47 | + |
48 | +void syslinux_patch_bootsect(int dev_fd); | 48 | +void syslinux_patch_bootsect(int dev_fd); |
49 | diff --git a/linux/Makefile b/linux/Makefile | 49 | diff --git a/linux/Makefile b/linux/Makefile |
50 | index ac1ac58..3b23867 100644 | 50 | index 67cbbb4..567134c 100644 |
51 | --- a/linux/Makefile | 51 | --- a/linux/Makefile |
52 | +++ b/linux/Makefile | 52 | +++ b/linux/Makefile |
53 | @@ -30,7 +30,8 @@ SRCS = syslinux.c \ | 53 | @@ -31,7 +31,8 @@ SRCS = syslinux.c \ |
54 | ../libinstaller/syslxmod.c \ | 54 | ../libinstaller/syslxmod.c \ |
55 | ../libinstaller/bootsect_bin.c \ | 55 | ../libinstaller/bootsect_bin.c \ |
56 | ../libinstaller/ldlinuxc32_bin.c \ | 56 | ../libinstaller/ldlinuxc32_bin.c \ |
@@ -61,7 +61,7 @@ index ac1ac58..3b23867 100644 | |||
61 | 61 | ||
62 | .SUFFIXES: .c .o .i .s .S | 62 | .SUFFIXES: .c .o .i .s .S |
63 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 63 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
64 | index de5d272..f0c97a8 100755 | 64 | index 90b8edd..7a20fe6 100755 |
65 | --- a/linux/syslinux.c | 65 | --- a/linux/syslinux.c |
66 | +++ b/linux/syslinux.c | 66 | +++ b/linux/syslinux.c |
67 | @@ -46,6 +46,7 @@ | 67 | @@ -46,6 +46,7 @@ |
@@ -72,7 +72,7 @@ index de5d272..f0c97a8 100755 | |||
72 | 72 | ||
73 | #include "linuxioctl.h" | 73 | #include "linuxioctl.h" |
74 | 74 | ||
75 | @@ -72,6 +73,7 @@ | 75 | @@ -73,6 +74,7 @@ |
76 | #include "syslxfs.h" | 76 | #include "syslxfs.h" |
77 | #include "setadv.h" | 77 | #include "setadv.h" |
78 | #include "syslxopt.h" /* unified options */ | 78 | #include "syslxopt.h" /* unified options */ |
@@ -80,7 +80,7 @@ index de5d272..f0c97a8 100755 | |||
80 | #include <ext2fs/ext2fs.h> | 80 | #include <ext2fs/ext2fs.h> |
81 | 81 | ||
82 | extern const char *program; /* Name of program */ | 82 | extern const char *program; /* Name of program */ |
83 | @@ -419,6 +421,12 @@ int install_bootblock(int fd, const char *device) | 83 | @@ -420,6 +422,12 @@ int install_bootblock(int fd, const char *device) |
84 | { | 84 | { |
85 | } | 85 | } |
86 | 86 | ||
@@ -93,7 +93,7 @@ index de5d272..f0c97a8 100755 | |||
93 | static int handle_adv_on_ext(void) | 93 | static int handle_adv_on_ext(void) |
94 | { | 94 | { |
95 | int i, retval, found_file; | 95 | int i, retval, found_file; |
96 | @@ -524,6 +532,116 @@ fail: | 96 | @@ -525,6 +533,116 @@ fail: |
97 | static int write_to_ext(const char *filename, const char *str, int length, | 97 | static int write_to_ext(const char *filename, const char *str, int length, |
98 | int i_flags, int dev_fd, const char *subdir) | 98 | int i_flags, int dev_fd, const char *subdir) |
99 | { | 99 | { |
@@ -210,6 +210,3 @@ index de5d272..f0c97a8 100755 | |||
210 | } | 210 | } |
211 | 211 | ||
212 | /* The install func for ext2, ext3 and ext4 */ | 212 | /* The install func for ext2, ext3 and ext4 */ |
213 | -- | ||
214 | 1.9.1 | ||
215 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch b/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch index 3913811917..57cdaf437b 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a95b831e18dd123f859bc5e6c4cecdcc0184ee37 Mon Sep 17 00:00:00 2001 | 1 | From 906205015601d5d1190e7326f51ea4316a74a479 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: Fri, 2 Jan 2015 12:18:02 +0800 | 3 | Date: Fri, 2 Jan 2015 12:18:02 +0800 |
4 | Subject: [PATCH 7/9] linux/syslinux: implement ext_construct_sectmap_fs() | 4 | Subject: [PATCH] linux/syslinux: implement ext_construct_sectmap_fs() |
5 | 5 | ||
6 | The ext_construct_sectmap_fs() constucts the sector according to the | 6 | The ext_construct_sectmap_fs() constucts the sector according to the |
7 | bmap. | 7 | bmap. |
@@ -11,14 +11,14 @@ Upstream-Status: Submitted | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
12 | Tested-by: Du Dolpher <dolpher.du@intel.com> | 12 | Tested-by: Du Dolpher <dolpher.du@intel.com> |
13 | --- | 13 | --- |
14 | linux/syslinux.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ | 14 | linux/syslinux.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ |
15 | 1 file changed, 50 insertions(+) | 15 | 1 file changed, 50 insertions(+) |
16 | 16 | ||
17 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 17 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
18 | index f0c97a8..c741750 100755 | 18 | index 7a20fe6..4e43921 100755 |
19 | --- a/linux/syslinux.c | 19 | --- a/linux/syslinux.c |
20 | +++ b/linux/syslinux.c | 20 | +++ b/linux/syslinux.c |
21 | @@ -421,10 +421,60 @@ int install_bootblock(int fd, const char *device) | 21 | @@ -422,10 +422,60 @@ int install_bootblock(int fd, const char *device) |
22 | { | 22 | { |
23 | } | 23 | } |
24 | 24 | ||
@@ -79,6 +79,3 @@ index f0c97a8..c741750 100755 | |||
79 | } | 79 | } |
80 | 80 | ||
81 | static int handle_adv_on_ext(void) | 81 | static int handle_adv_on_ext(void) |
82 | -- | ||
83 | 1.9.1 | ||
84 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch index f1d01fa43c..b026eba5ad 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From efce87e5ab98664c57e5f4e3955a2f3747df5737 Mon Sep 17 00:00:00 2001 | 1 | From acfc8214d3d60b7e251ae66a59b81cdd1ff7a6dc 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: Fri, 2 Jan 2015 12:26:46 +0800 | 3 | Date: Fri, 2 Jan 2015 12:26:46 +0800 |
4 | Subject: [PATCH] libinstaller/syslinuxext: implement syslinux_patch_bootsect() | 4 | Subject: [PATCH] libinstaller/syslinuxext: implement syslinux_patch_bootsect() |
@@ -22,7 +22,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
22 | 3 files changed, 176 insertions(+), 165 deletions(-) | 22 | 3 files changed, 176 insertions(+), 165 deletions(-) |
23 | 23 | ||
24 | diff --git a/extlinux/Makefile b/extlinux/Makefile | 24 | diff --git a/extlinux/Makefile b/extlinux/Makefile |
25 | index 1721ee54..62a49728 100644 | 25 | index 1721ee5..62a4972 100644 |
26 | --- a/extlinux/Makefile | 26 | --- a/extlinux/Makefile |
27 | +++ b/extlinux/Makefile | 27 | +++ b/extlinux/Makefile |
28 | @@ -32,7 +32,8 @@ SRCS = main.c \ | 28 | @@ -32,7 +32,8 @@ SRCS = main.c \ |
@@ -36,7 +36,7 @@ index 1721ee54..62a49728 100644 | |||
36 | 36 | ||
37 | .SUFFIXES: .c .o .i .s .S | 37 | .SUFFIXES: .c .o .i .s .S |
38 | diff --git a/extlinux/main.c b/extlinux/main.c | 38 | diff --git a/extlinux/main.c b/extlinux/main.c |
39 | index ebff7eae..9add50fb 100644 | 39 | index ebff7ea..9add50f 100644 |
40 | --- a/extlinux/main.c | 40 | --- a/extlinux/main.c |
41 | +++ b/extlinux/main.c | 41 | +++ b/extlinux/main.c |
42 | @@ -62,6 +62,7 @@ | 42 | @@ -62,6 +62,7 @@ |
@@ -244,7 +244,7 @@ index ebff7eae..9add50fb 100644 | |||
244 | /* Construct the boot file map */ | 244 | /* Construct the boot file map */ |
245 | 245 | ||
246 | diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c | 246 | diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c |
247 | index bb54cefc..9ae82884 100644 | 247 | index bb54cef..9ae8288 100644 |
248 | --- a/libinstaller/syslinuxext.c | 248 | --- a/libinstaller/syslinuxext.c |
249 | +++ b/libinstaller/syslinuxext.c | 249 | +++ b/libinstaller/syslinuxext.c |
250 | @@ -1,7 +1,178 @@ | 250 | @@ -1,7 +1,178 @@ |
@@ -426,6 +426,3 @@ index bb54cefc..9ae82884 100644 | |||
426 | + set_32(&sbs->bsHiddenSecs, geo.start); | 426 | + set_32(&sbs->bsHiddenSecs, geo.start); |
427 | } | 427 | } |
428 | 428 | ||
429 | -- | ||
430 | 2.17.1 | ||
431 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch b/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch index cd89d92485..1c875e81f6 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 76c465e87312dbc6cffd05427f1f4d2ebdee4f13 Mon Sep 17 00:00:00 2001 | 1 | From c28aae8bd381f77e66e6bac79761df7a484b054c 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: Fri, 2 Jan 2015 12:28:35 +0800 | 3 | Date: Fri, 2 Jan 2015 12:28:35 +0800 |
4 | Subject: [PATCH 9/9] linux/syslinux: implement install_bootblock() | 4 | Subject: [PATCH] linux/syslinux: implement install_bootblock() |
5 | 5 | ||
6 | Refer to the install_bootblock() in extlinux/main.c to make | 6 | Refer to the install_bootblock() in extlinux/main.c to make |
7 | linux/syslinux.c's install_bootblock() which only supports ext2/3/4. | 7 | linux/syslinux.c's install_bootblock() which only supports ext2/3/4. |
@@ -15,10 +15,10 @@ Tested-by: Du Dolpher <dolpher.du@intel.com> | |||
15 | 1 file changed, 20 insertions(+) | 15 | 1 file changed, 20 insertions(+) |
16 | 16 | ||
17 | diff --git a/linux/syslinux.c b/linux/syslinux.c | 17 | diff --git a/linux/syslinux.c b/linux/syslinux.c |
18 | index c741750..917f83a 100755 | 18 | index 4e43921..93ed880 100755 |
19 | --- a/linux/syslinux.c | 19 | --- a/linux/syslinux.c |
20 | +++ b/linux/syslinux.c | 20 | +++ b/linux/syslinux.c |
21 | @@ -419,6 +419,26 @@ static int ext_file_write(ext2_file_t e2_file, const void *buf, size_t count, | 21 | @@ -420,6 +420,26 @@ static int ext_file_write(ext2_file_t e2_file, const void *buf, size_t count, |
22 | */ | 22 | */ |
23 | int install_bootblock(int fd, const char *device) | 23 | int install_bootblock(int fd, const char *device) |
24 | { | 24 | { |
@@ -45,6 +45,3 @@ index c741750..917f83a 100755 | |||
45 | } | 45 | } |
46 | 46 | ||
47 | /* The file's block count */ | 47 | /* The file's block count */ |
48 | -- | ||
49 | 1.9.1 | ||
50 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch b/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch index 44cb153276..3665af9c49 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001 | 1 | From f2a5b64785958226c022cac9931b059b98f4e896 Mon Sep 17 00:00:00 2001 |
2 | From: Merlin Mathesius <mmathesi@redhat.com> | 2 | From: Merlin Mathesius <mmathesi@redhat.com> |
3 | Date: Wed, 13 May 2020 08:02:27 -0500 | 3 | Date: Wed, 13 May 2020 08:02:27 -0500 |
4 | Subject: [PATCH] Workaround multiple definition of symbol errors | 4 | Subject: [PATCH] Workaround multiple definition of symbol errors |
@@ -7,7 +7,6 @@ Lifted from Fedora https://src.fedoraproject.org/rpms/syslinux/blob/master/f/000 | |||
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | com32/cmenu/Makefile | 2 +- | 11 | com32/cmenu/Makefile | 2 +- |
13 | com32/elflink/ldlinux/Makefile | 2 +- | 12 | com32/elflink/ldlinux/Makefile | 2 +- |
@@ -18,6 +17,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | efi/Makefile | 2 +- | 17 | efi/Makefile | 2 +- |
19 | 7 files changed, 7 insertions(+), 7 deletions(-) | 18 | 7 files changed, 7 insertions(+), 7 deletions(-) |
20 | 19 | ||
20 | diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile | ||
21 | index b81b68e..2ae989c 100644 | ||
21 | --- a/com32/cmenu/Makefile | 22 | --- a/com32/cmenu/Makefile |
22 | +++ b/com32/cmenu/Makefile | 23 | +++ b/com32/cmenu/Makefile |
23 | @@ -49,7 +49,7 @@ makeoutputdirs: | 24 | @@ -49,7 +49,7 @@ makeoutputdirs: |
@@ -29,6 +30,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | -o $@ $^ | 30 | -o $@ $^ |
30 | 31 | ||
31 | tidy dist: | 32 | tidy dist: |
33 | diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile | ||
34 | index 87c0d36..2be2a01 100644 | ||
32 | --- a/com32/elflink/ldlinux/Makefile | 35 | --- a/com32/elflink/ldlinux/Makefile |
33 | +++ b/com32/elflink/ldlinux/Makefile | 36 | +++ b/com32/elflink/ldlinux/Makefile |
34 | @@ -33,7 +33,7 @@ endif | 37 | @@ -33,7 +33,7 @@ endif |
@@ -40,6 +43,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
40 | 43 | ||
41 | LNXCFLAGS += -D__export='__attribute__((visibility("default")))' | 44 | LNXCFLAGS += -D__export='__attribute__((visibility("default")))' |
42 | LNXLIBOBJS = get_key.lo | 45 | LNXLIBOBJS = get_key.lo |
46 | diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile | ||
47 | index 1fec914..2d764d0 100644 | ||
43 | --- a/com32/gpllib/Makefile | 48 | --- a/com32/gpllib/Makefile |
44 | +++ b/com32/gpllib/Makefile | 49 | +++ b/com32/gpllib/Makefile |
45 | @@ -24,7 +24,7 @@ makeoutputdirs: | 50 | @@ -24,7 +24,7 @@ makeoutputdirs: |
@@ -51,6 +56,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
51 | 56 | ||
52 | tidy dist clean: | 57 | tidy dist clean: |
53 | find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ | 58 | find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ |
59 | diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile | ||
60 | index 61736d0..1d94785 100644 | ||
54 | --- a/com32/hdt/Makefile | 61 | --- a/com32/hdt/Makefile |
55 | +++ b/com32/hdt/Makefile | 62 | +++ b/com32/hdt/Makefile |
56 | @@ -52,7 +52,7 @@ QEMU ?= qemu-kvm | 63 | @@ -52,7 +52,7 @@ QEMU ?= qemu-kvm |
@@ -62,6 +69,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
62 | 69 | ||
63 | memtest: | 70 | memtest: |
64 | -[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST) | 71 | -[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST) |
72 | diff --git a/core/Makefile b/core/Makefile | ||
73 | index 50ff35a..f0a5562 100644 | ||
65 | --- a/core/Makefile | 74 | --- a/core/Makefile |
66 | +++ b/core/Makefile | 75 | +++ b/core/Makefile |
67 | @@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld | 76 | @@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld |
@@ -73,6 +82,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
73 | -T $(LDSCRIPT) \ | 82 | -T $(LDSCRIPT) \ |
74 | --unresolved-symbols=report-all \ | 83 | --unresolved-symbols=report-all \ |
75 | -E --hash-style=gnu -M -o $@ $< \ | 84 | -E --hash-style=gnu -M -o $@ $< \ |
85 | diff --git a/dos/Makefile b/dos/Makefile | ||
86 | index 4c930d1..5d1c72c 100644 | ||
76 | --- a/dos/Makefile | 87 | --- a/dos/Makefile |
77 | +++ b/dos/Makefile | 88 | +++ b/dos/Makefile |
78 | @@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk | 89 | @@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk |
@@ -84,6 +95,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
84 | OPTFLAGS = -g | 95 | OPTFLAGS = -g |
85 | INCLUDES = -include code16.h -nostdinc -iwithprefix include \ | 96 | INCLUDES = -include code16.h -nostdinc -iwithprefix include \ |
86 | -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \ | 97 | -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \ |
98 | diff --git a/efi/Makefile b/efi/Makefile | ||
99 | index f4501e7..72e081e 100644 | ||
87 | --- a/efi/Makefile | 100 | --- a/efi/Makefile |
88 | +++ b/efi/Makefile | 101 | +++ b/efi/Makefile |
89 | @@ -71,7 +71,7 @@ $(OBJS): | $(OBJ)/$(ARCH) | 102 | @@ -71,7 +71,7 @@ $(OBJS): | $(OBJ)/$(ARCH) |
diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch b/meta/recipes-devtools/syslinux/syslinux/0011-install-don-t-install-obsolete-file-com32.ld.patch index bfd7f41b13..4bc423a1de 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0011-install-don-t-install-obsolete-file-com32.ld.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf6db5b48ec25f83939f1fdebb59028bc3c40b00 Mon Sep 17 00:00:00 2001 | 1 | From 66447f7c5c6996481ebd68ce8224d3de7525aad8 Mon Sep 17 00:00:00 2001 |
2 | From: "H. Peter Anvin (Intel)" <hpa@zytor.com> | 2 | From: "H. Peter Anvin (Intel)" <hpa@zytor.com> |
3 | Date: Wed, 6 Feb 2019 11:30:51 -0800 | 3 | Date: Wed, 6 Feb 2019 11:30:51 -0800 |
4 | Subject: [PATCH] install: don't install obsolete file com32.ld | 4 | Subject: [PATCH] install: don't install obsolete file com32.ld |
@@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
16 | 1 file changed, 1 deletion(-) | 16 | 1 file changed, 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/com32/lib/Makefile b/com32/lib/Makefile | 18 | diff --git a/com32/lib/Makefile b/com32/lib/Makefile |
19 | index 74fff149..6a931492 100644 | 19 | index 74fff14..6a93149 100644 |
20 | --- a/com32/lib/Makefile | 20 | --- a/com32/lib/Makefile |
21 | +++ b/com32/lib/Makefile | 21 | +++ b/com32/lib/Makefile |
22 | @@ -113,7 +113,6 @@ spotless: clean | 22 | @@ -113,7 +113,6 @@ spotless: clean |
@@ -27,6 +27,3 @@ index 74fff149..6a931492 100644 | |||
27 | -rm -rf $(INSTALLROOT)$(COM32DIR)/include | 27 | -rm -rf $(INSTALLROOT)$(COM32DIR)/include |
28 | cp -r $(SRC)/../include $(INSTALLROOT)$(COM32DIR) | 28 | cp -r $(SRC)/../include $(INSTALLROOT)$(COM32DIR) |
29 | 29 | ||
30 | -- | ||
31 | 2.17.1 | ||
32 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/0012-libinstaller-Fix-build-with-glibc-2.36.patch b/meta/recipes-devtools/syslinux/syslinux/0012-libinstaller-Fix-build-with-glibc-2.36.patch index b16eec0076..6f8314dab8 100644 --- a/meta/recipes-devtools/syslinux/syslinux/0012-libinstaller-Fix-build-with-glibc-2.36.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0012-libinstaller-Fix-build-with-glibc-2.36.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c4f97b2dd22365d32b865dd002282e454a7edf0 Mon Sep 17 00:00:00 2001 | 1 | From 821d31148c07a8318277be32bc6a943c7fd2ba3f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Aug 2022 11:53:55 +0000 | 3 | Date: Sat, 6 Aug 2022 11:53:55 +0000 |
4 | Subject: [PATCH] libinstaller: Fix build with glibc-2.36 | 4 | Subject: [PATCH] libinstaller: Fix build with glibc-2.36 |
diff --git a/meta/recipes-devtools/syslinux/syslinux/0013-remove-clean-script.patch b/meta/recipes-devtools/syslinux/syslinux/0013-remove-clean-script.patch new file mode 100644 index 0000000000..c0af7eff86 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0013-remove-clean-script.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From a11c8f88de6b6c42c805ba76e70532977bfd24bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Wed, 10 Dec 2014 10:26:33 -0800 | ||
4 | Subject: [PATCH] remove clean script | ||
5 | |||
6 | This script try to call git submodule, since we are downloading | ||
7 | the tarball it seems in-correct to do this. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | efi/Makefile | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/efi/Makefile b/efi/Makefile | ||
17 | index 72e081e..3cfb3f6 100644 | ||
18 | --- a/efi/Makefile | ||
19 | +++ b/efi/Makefile | ||
20 | @@ -102,7 +102,6 @@ tidy dist: | ||
21 | rm -f *.so *.o wrapper | ||
22 | find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \ | ||
23 | xargs -0r rm -f | ||
24 | - $(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir) | ||
25 | |||
26 | clean: tidy | ||
27 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux/determinism.patch b/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch index 2fb8c64df3..372b2a5ff5 100644 --- a/meta/recipes-devtools/syslinux/syslinux/determinism.patch +++ b/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From e49e86bd3199f51ada8a4a1d51aa8d627645279e Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Sat, 27 Feb 2021 23:42:03 +0000 | ||
4 | Subject: [PATCH] Fix reproducibility issues | ||
5 | |||
1 | In order to build deterministic binaries, we need to sort the wildcard expansion | 6 | In order to build deterministic binaries, we need to sort the wildcard expansion |
2 | so the libraries are linked in the same order each time. This fixes reproducibility | 7 | so the libraries are linked in the same order each time. This fixes reproducibility |
3 | issues within syslinux builds. | 8 | issues within syslinux builds. |
@@ -5,10 +10,15 @@ issues within syslinux builds. | |||
5 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
6 | RP 2021/3/1 | 11 | RP 2021/3/1 |
7 | 12 | ||
8 | Index: syslinux-6.04-pre2/mk/lib.mk | 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
9 | =================================================================== | 14 | --- |
10 | --- syslinux-6.04-pre2.orig/mk/lib.mk | 15 | mk/lib.mk | 4 ++-- |
11 | +++ syslinux-6.04-pre2/mk/lib.mk | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
17 | |||
18 | diff --git a/mk/lib.mk b/mk/lib.mk | ||
19 | index f3fb07c..815698c 100644 | ||
20 | --- a/mk/lib.mk | ||
21 | +++ b/mk/lib.mk | ||
12 | @@ -130,8 +130,8 @@ LIBENTRY_OBJS = \ | 22 | @@ -130,8 +130,8 @@ LIBENTRY_OBJS = \ |
13 | exit.o | 23 | exit.o |
14 | 24 | ||
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch deleted file mode 100644 index 7c003e165b..0000000000 --- a/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | This script try to call git submodule, since we are downloading | ||
2 | the tarball it seems in-correct to do this. | ||
3 | |||
4 | Upstream-Status: Inappropriate [OE-Specific] | ||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | Index: syslinux-6.03/efi/Makefile | ||
7 | =================================================================== | ||
8 | --- syslinux-6.03.orig/efi/Makefile | ||
9 | +++ syslinux-6.03/efi/Makefile | ||
10 | @@ -101,7 +101,6 @@ tidy dist: | ||
11 | rm -f *.so *.o wrapper | ||
12 | find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \ | ||
13 | xargs -0r rm -f | ||
14 | - $(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir) | ||
15 | |||
16 | clean: tidy | ||
17 | |||
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index d8dac8ccf9..5604901592 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | |||
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | |||
8 | DEPENDS = "nasm-native util-linux e2fsprogs" | 8 | DEPENDS = "nasm-native util-linux e2fsprogs" |
9 | 9 | ||
10 | SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \ | 10 | SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \ |
11 | file://syslinux-remove-clean-script.patch \ | ||
12 | file://0001-linux-syslinux-support-ext2-3-4-device.patch \ | 11 | file://0001-linux-syslinux-support-ext2-3-4-device.patch \ |
13 | file://0002-linux-syslinux-implement-open_ext2_fs.patch \ | 12 | file://0002-linux-syslinux-implement-open_ext2_fs.patch \ |
14 | file://0003-linux-syslinux-implement-install_to_ext2.patch \ | 13 | file://0003-linux-syslinux-implement-install_to_ext2.patch \ |
@@ -19,10 +18,11 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz | |||
19 | file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ | 18 | file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ |
20 | file://0009-linux-syslinux-implement-install_bootblock.patch \ | 19 | file://0009-linux-syslinux-implement-install_bootblock.patch \ |
21 | file://0010-Workaround-multiple-definition-of-symbol-errors.patch \ | 20 | file://0010-Workaround-multiple-definition-of-symbol-errors.patch \ |
22 | file://0001-install-don-t-install-obsolete-file-com32.ld.patch \ | 21 | file://0011-install-don-t-install-obsolete-file-com32.ld.patch \ |
23 | file://0012-libinstaller-Fix-build-with-glibc-2.36.patch \ | 22 | file://0012-libinstaller-Fix-build-with-glibc-2.36.patch \ |
24 | file://determinism.patch \ | 23 | file://0013-remove-clean-script.patch \ |
25 | " | 24 | file://0014-Fix-reproducibility-issues.patch \ |
25 | " | ||
26 | 26 | ||
27 | SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" | 27 | SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" |
28 | SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" | 28 | SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94" |