summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch2
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch2
-rw-r--r--meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch2
-rw-r--r--meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch2
-rw-r--r--meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch2
-rw-r--r--meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch2
-rw-r--r--meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch3
-rw-r--r--meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch2
-rw-r--r--meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch2
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch2
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch2
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch2
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch14
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch16
-rw-r--r--meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch2
-rw-r--r--meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch2
-rw-r--r--meta-networking/recipes-support/chrony/chrony/arm_eabi.patch24
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch2
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch2
-rw-r--r--meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch2
20 files changed, 44 insertions, 45 deletions
diff --git a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
index a100b7cb83..cb986b85da 100644
--- a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
+++ b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
@@ -1,4 +1,4 @@
1Upstream-Status:Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
3fix the below error: 3fix the below error:
4configure: error: cannot run test program while cross compiling 4configure: error: cannot run test program while cross compiling
diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
index 30ec174395..98c20b6ecf 100644
--- a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
+++ b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable run test program while cross compiling
6fix configure error: 6fix configure error:
7configure: error: cannot run test program while cross compiling 7configure: error: cannot run test program while cross compiling
8 8
9Upstream-Status:Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10 10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12--- 12---
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
index 452aa05f81..4f3dcd7767 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
+++ b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
@@ -1,6 +1,6 @@
1[PATCH] fix the empty file writting 1[PATCH] fix the empty file writting
2 2
3Upstream-Status: pending 3Upstream-Status: Pending
4 4
5With the feature that checking the disk filled up, the return 5With the feature that checking the disk filled up, the return
6value of function write_behind was checked and used to detect 6value of function write_behind was checked and used to detect
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
index 3e220ec385..e994f28402 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
+++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
@@ -7,7 +7,7 @@ In ascii mode, if the CR and LF was separated into different transfer
7blocks, LF will be just dropped instead of replacing the previous CR. 7blocks, LF will be just dropped instead of replacing the previous CR.
8Add a checking on the first character to fix it. 8Add a checking on the first character to fix it.
9 9
10Upstream-Status: pending 10Upstream-Status: Pending
11 11
12Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> 12Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
13--- 13---
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch
index e59501cc49..d57d0e61b5 100644
--- a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch
@@ -15,7 +15,7 @@ Fixes:
15 | | ^~~~ 15 | | ^~~~
16 | cc1: all warnings being treated as errors 16 | cc1: all warnings being treated as errors
17 17
18Upstream-Status: Submitted[https://github.com/kronosnet/kronosnet/pull/382] 18Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/382]
19 19
20Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 20Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
21--- 21---
diff --git a/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch
index 078ba9ef50..a3ea604086 100644
--- a/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch
+++ b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
6 packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib 6 packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib
7 [useless-rpaths] 7 [useless-rpaths]
8 8
9Upstream-Status: pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
12 12
diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
index 5a47fd9175..5db004865f 100644
--- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
+++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
@@ -1,7 +1,6 @@
1This adds ARG_MAX define to be _SC_ARG_MAX 1This adds ARG_MAX define to be _SC_ARG_MAX
2 2
3Upstream-Status: Inappropriate. 3Upstream-Status: Inappropriate [Most distros have their own verion for this fix]
4Most distros have their own verion for this fix.
5 4
6Signed-off-by: Armin Kuster <akuster808@gmail.com> 5Signed-off-by: Armin Kuster <akuster808@gmail.com>
7 6
diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch b/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
index 7fff8cffc4..34a6479790 100644
--- a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
+++ b/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] To aviod buffer overflow in telnet
5 5
6This patch is from Fedora. 6This patch is from Fedora.
7 7
8Upstream-Status: pending 8Upstream-Status: Pending
9 9
10Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 10Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
11--- 11---
diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch b/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
index b9a98f1d6f..9ac75439da 100644
--- a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
+++ b/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
@@ -6,7 +6,7 @@ Subject: [PATCH 2/2] WARNING Fix and modify "CFLAGS"
6WARNING: QA Issue: File '/usr/sbin/in.telnetd' from netkit-telnet was 6WARNING: QA Issue: File '/usr/sbin/in.telnetd' from netkit-telnet was
7already stripped, this will prevent future debugging! [already-stripped] 7already stripped, this will prevent future debugging! [already-stripped]
8 8
9Upstream-Status: pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
12--- 12---
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
index f8a52a63f5..5aea52788c 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
@@ -10,7 +10,7 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory
10 #include <pkg.h> 10 #include <pkg.h>
11 ^ 11 ^
12 12
13Upstream-Status: pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 15Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
16 16
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
index 96dbc7551d..8e9bd1e9ee 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
@@ -3,7 +3,7 @@ From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Mon, 1 Dec 2014 01:53:41 +0900 3Date: Mon, 1 Dec 2014 01:53:41 +0900
4Subject: [PATCH] Makefile:modify CFLAGS to aviod build error. 4Subject: [PATCH] Makefile:modify CFLAGS to aviod build error.
5 5
6Upstream-Status: pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 8Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
9--- 9---
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
index c9cf15c1db..2a7435963e 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
@@ -10,7 +10,7 @@ it in place but remove the #if guard since it is only there to ensure that
10the l2tp_private.h file is updated if the rpc source file is changed and 10the l2tp_private.h file is updated if the rpc source file is changed and
11the two get out of sync. 11the two get out of sync.
12 12
13Upstream-Status: pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> 15Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
16--- 16---
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
index 3119425e69..c094e3859b 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
@@ -2,17 +2,17 @@ commit 6ea3125e2bec15004f312814022335d94cdf7e94
2Author: Aws Ismail <aws.ismail@windriver.com> 2Author: Aws Ismail <aws.ismail@windriver.com>
3Date: Wed Sep 19 11:34:48 2012 -0400 3Date: Wed Sep 19 11:34:48 2012 -0400
4 4
5 Fix openl2tp config script location 5Fix openl2tp config script location
6 6
7 Correct the location of the sysconfig 7Correct the location of the sysconfig
8 script. Use /etc/default/ instead of 8script. Use /etc/default/ instead of
9 /etc/sysconfig/ 9/etc/sysconfig/
10 10
11 Signed-off-by: Aws Ismail <aws.ismail@windriver.com> 11Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
12 12
13 Upstream-Status: Inappropriate [configuration] 13Upstream-Status: Inappropriate [configuration]
14 14
15 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 15Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
16 16
17diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd 17diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd
18index 7f27bb7..4194f63 100755 18index 7f27bb7..4194f63 100755
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
index 9ecd4b072f..51bddb8942 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
@@ -2,16 +2,16 @@ commit 7c58a1e244ea83a9e7bbd51a6d354cee25cdbd33
2Author: Aws Ismail <aws.ismail@windriver.com> 2Author: Aws Ismail <aws.ismail@windriver.com>
3Date: Wed Sep 12 23:35:40 2012 -0400 3Date: Wed Sep 12 23:35:40 2012 -0400
4 4
5 Fix openl2tpd initscript 5Fix openl2tpd initscript
6
7 - Correct the location of the retval statement.
8 - use start-stop-daemon instead of daemon.
9
10 Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
11 6
12 Upstream-Status: Inappropriate [OE specific] 7- Correct the location of the retval statement.
8- use start-stop-daemon instead of daemon.
13 9
14 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 10Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
11
12Upstream-Status: Inappropriate [OE specific]
13
14Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
15 15
16diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd 16diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd
17index ce21b50..7f27bb7 100755 17index ce21b50..7f27bb7 100755
diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
index ecc2d74e74..fd9961b9e8 100644
--- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
+++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Modify configure.in and etc/Makefile.am
6this patch is from Fedora to fix error: 6this patch is from Fedora to fix error:
7"conftest.c:26:9: error: unknown type name 'not'" 7"conftest.c:26:9: error: unknown type name 'not'"
8 8
9Upstream-Status: pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
12--- 12---
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch
index bbd516fde9..9e60b98fd3 100644
--- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.in-Error-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] configure.in: Error fix.
6the error is: conftest.c:9:28: fatal error: ac_nonexistent.h: 6the error is: conftest.c:9:28: fatal error: ac_nonexistent.h:
7No such file or directory #include <ac_nonexistent.h> 7No such file or directory #include <ac_nonexistent.h>
8 8
9Upstream-Status: pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
12 12
diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
index 5ba2081262..82c0e1b68b 100644
--- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
+++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
@@ -3,25 +3,25 @@ From: Joe Slater <jslater@windriver.com>
3Date: Thu, 9 Mar 2017 10:58:06 -0800 3Date: Thu, 9 Mar 2017 10:58:06 -0800
4Subject: [PATCH] chrony: fix build failure for arma9 4Subject: [PATCH] chrony: fix build failure for arma9
5 5
6 Eliminate references to syscalls not available 6Eliminate references to syscalls not available
7 for ARM_EABI. Also add a dependency on libseccomp 7for ARM_EABI. Also add a dependency on libseccomp
8 which is needed for scfilter to work. 8which is needed for scfilter to work.
9 9
10 Set PACKAGECONFIG to not enable scfilter, since 10Set PACKAGECONFIG to not enable scfilter, since
11 kernel CONFIG_SECCOMP is unlikely to be set. This 11kernel CONFIG_SECCOMP is unlikely to be set. This
12 aligns the usage of libseccomp with that of other packages. 12aligns the usage of libseccomp with that of other packages.
13 13
14 Upstream-Status: Pending 14Upstream-Status: Pending
15 15
16 Signed-off-by: Joe Slater <jslater@windriver.com> 16Signed-off-by: Joe Slater <jslater@windriver.com>
17 17
18 Refresh patch for new upstream version. 18Refresh patch for new upstream version.
19 19
20 Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> 20Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
21 21
22 Refreshed for 4.0 22Refreshed for 4.0
23 23
24 Signed-off-by: Khem Raj <raj.khem@gmail.com> 24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 25
26--- 26---
27 sys_linux.c | 15 +++++++++------ 27 sys_linux.c | 15 +++++++++------
diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
index f16f687f24..4fcfa48b99 100644
--- a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
+++ b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] configure.ac: convert AC_TRY_RUN to AC_TRY_LINK statements
5 5
6This is not completely safe, but it's the least invasive fix. 6This is not completely safe, but it's the least invasive fix.
7 7
8Upstream-Status: pending 8Upstream-Status: Pending
9 9
10Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 10Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
index 84e3ad0968..4e1f68be09 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -3,7 +3,7 @@ From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 21 Apr 2022 17:22:35 +0800 3Date: Thu, 21 Apr 2022 17:22:35 +0800
4Subject: [PATCH] drbd-utils: support usermerge 4Subject: [PATCH] drbd-utils: support usermerge
5 5
6Upstream-Status: Inappropriate[oe-specific] 6Upstream-Status: Inappropriate [oe-specific]
7 7
8Signed-off-by: Changqing Li <changqing.li@windriver.com> 8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
diff --git a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
index 0cb981cf7a..4e1498a366 100644
--- a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
+++ b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Makefile: tweak install dir
6For oe-core, the man doc should be installed to /usr/share/man 6For oe-core, the man doc should be installed to /usr/share/man
7rather than /usr/locale/man. 7rather than /usr/locale/man.
8 8
9Upstream-Status: inappropriate (oe specific) 9Upstream-Status: Inappropriate [oe specific]
10 10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12--- 12---