summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/syslinux
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-09-01 09:21:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-02 15:58:25 +0100
commit941604945c0e2b99dac912a984961073d8b2f687 (patch)
treef0214b3b31c4a1b5ebfa6086758abaa843acde62 /meta/recipes-devtools/syslinux
parent0c0cd1644773c4ec2c145c11d6a958025b64f8bd (diff)
downloadpoky-941604945c0e2b99dac912a984961073d8b2f687.tar.gz
syslinux: mark all pending patches as Inactive-Upstream
As seen here https://repo.or.cz/syslinux.git/shortlog (From OE-Core rev: adcfd42cf83ac9d49ebfcc2260c0df7f891e49ce) Signed-off-by: Alexander Kanavin <alex@linutronix.de> 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')
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0010-Workaround-multiple-definition-of-symbol-errors.patch2
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0012-libinstaller-Fix-build-with-glibc-2.36.patch2
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch2
3 files changed, 3 insertions, 3 deletions
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 3665af9c49..813d10ba5c 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
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround multiple definition of symbol errors
5 5
6Lifted from Fedora https://src.fedoraproject.org/rpms/syslinux/blob/master/f/0005-Workaround-multiple-definition-of-symbol-errors.patch 6Lifted from Fedora https://src.fedoraproject.org/rpms/syslinux/blob/master/f/0005-Workaround-multiple-definition-of-symbol-errors.patch
7 7
8Upstream-Status: Pending 8Upstream-Status: Inactive-Upstream
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 com32/cmenu/Makefile | 2 +- 11 com32/cmenu/Makefile | 2 +-
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 6f8314dab8..21b83e49dc 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
@@ -22,7 +22,7 @@ TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/recipe-sysroot/usr
22 | ^~~~~~~~~~~~~~~~~ 22 | ^~~~~~~~~~~~~~~~~
23... 23...
24 24
25Upstream-Status: Pending 25Upstream-Status: Inactive-Upstream
26Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 26Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
27--- 27---
28 libinstaller/linuxioctl.h | 15 ++++++++++++++- 28 libinstaller/linuxioctl.h | 15 ++++++++++++++-
diff --git a/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch b/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch
index 372b2a5ff5..bc48160cba 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch
+++ b/meta/recipes-devtools/syslinux/syslinux/0014-Fix-reproducibility-issues.patch
@@ -7,7 +7,7 @@ In order to build deterministic binaries, we need to sort the wildcard expansion
7so the libraries are linked in the same order each time. This fixes reproducibility 7so the libraries are linked in the same order each time. This fixes reproducibility
8issues within syslinux builds. 8issues within syslinux builds.
9 9
10Upstream-Status: Pending 10Upstream-Status: Inactive-Upstream
11RP 2021/3/1 11RP 2021/3/1
12 12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>