summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-11-25 10:44:50 +0800
committerKhem Raj <raj.khem@gmail.com>2021-11-25 10:14:18 -0800
commit2fb000b020adf89478aa08e1f5d7f2e9c1813e2a (patch)
tree95e9e685f23d15a48814192d5d92c860575110d4
parentd3eb0a9e848cf5085c1579ec2277f546866f7f87 (diff)
downloadmeta-openembedded-2fb000b020adf89478aa08e1f5d7f2e9c1813e2a.tar.gz
samba: update cross-answers files
Replace the configure tests UNKNOWN answers with the correct answers. Then drop the related patches. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-arm.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-armeb.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-i586.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-i686.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-mips.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-mips64.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt5
-rw-r--r--meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt5
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch39
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch39
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch79
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch92
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.14.10.bb4
21 files changed, 80 insertions, 253 deletions
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
index fc0400dfd0..a89d9b358d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
index fc0400dfd0..a89d9b358d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
index 759afe8f92..b32967539f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt
index 759afe8f92..b32967539f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
index 759afe8f92..b32967539f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
index 759afe8f92..b32967539f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
index c989f270b5..e8844981ee 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
index 215f574835..e78761de6d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt
index 215f574835..e78761de6d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
index c989f270b5..e8844981ee 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
index f1079749e1..4d2726139e 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
index 7a443cc015..b32d30b34f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: OK 41Checking for a 64-bit host to support lmdb: OK
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt
index 7a443cc015..b32d30b34f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: OK 41Checking for a 64-bit host to support lmdb: OK
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt
index 759afe8f92..b32967539f 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt
@@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO
39Checking whether blkcnt_t is 64 bit: OK 39Checking whether blkcnt_t is 64 bit: OK
40Checking whether fcntl lock supports open file description locks: OK 40Checking whether fcntl lock supports open file description locks: OK
41Checking for a 64-bit host to support lmdb: NO 41Checking for a 64-bit host to support lmdb: NO
42Checking errno of iconv for illegal multibyte sequence: NO
43Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
44Checking value of GNUTLS_MAC_AES_CMAC_128: OK
45Checking whether fcntl supports flags to send direct I/O availability signals: NO
46Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
index fc0400dfd0..a89d9b358d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
index fc0400dfd0..a89d9b358d 100644
--- a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
+++ b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
@@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO
38Checking whether blkcnt_t is 64 bit: OK 38Checking whether blkcnt_t is 64 bit: OK
39Checking whether fcntl lock supports open file description locks: OK 39Checking whether fcntl lock supports open file description locks: OK
40Checking for a 64-bit host to support lmdb: OK 40Checking for a 64-bit host to support lmdb: OK
41Checking errno of iconv for illegal multibyte sequence: NO
42Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
43Checking value of GNUTLS_MAC_AES_CMAC_128: OK
44Checking whether fcntl supports flags to send direct I/O availability signals: NO
45Checking whether fcntl supports setting/geting hints: NO
diff --git a/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch b/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch
deleted file mode 100644
index 00b692b580..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 59f7098bfbd63f9b3c19d7d297a8f90870a1893d Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Mon, 31 May 2021 14:50:38 +0800
4Subject: [PATCH] samba: defeat iconv test
5
6A test was added when configuring samba which requires target code
7to be executed. In general, this will not work, so we eliminate it.
8
9Upstream-Status: Pending
10
11Signed-off-by: Joe Slater <joe.slater@windriver.com>
12---
13 lib/util/charset/wscript_configure | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
17index 9c27fc6..845eb36 100644
18--- a/lib/util/charset/wscript_configure
19+++ b/lib/util/charset/wscript_configure
20@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h
21
22 conf.DEFINE('HAVE_NATIVE_ICONV', 1)
23
24+"""
25+[added for 4.7.0, but breaks cross-compilation]
26 conf.CHECK_CODE('''
27 uint8_t inbuf[2] = { 0x30, 0xdf };
28 uint8_t outbuf[4] = { 0 };
29@@ -36,6 +38,7 @@ conf.CHECK_CODE('''
30 msg='Checking errno of iconv for illegal multibyte sequence',
31 lib='iconv',
32 headers='errno.h iconv.h')
33+"""
34
35 if conf.CHECK_CFG(package='icu-i18n',
36 args='--cflags --libs',
37--
382.17.1
39
diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch b/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch
deleted file mode 100644
index 0f843af20a..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a31a014c5d98501074fde1acb5c00162c927c361 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 31 May 2021 15:47:58 +0800
4Subject: [PATCH] wscript_configure_system_gnutls: disable check gnutls
5 AES_CFB8/AES_CMAC
6
7The CHECK_VALUEOF() can not work on cross-compilation.
8
9Fixes configure error:
10 Checking value of GNUTLS_CIPHER_AES_128_CFB8: UNKNOWN
11 Checking value of GNUTLS_MAC_AES_CMAC_128: UNKNOWN
12
13Upstream-Status: Inappropriate [embedded specific]
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 wscript_configure_system_gnutls | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
21index 2ec217f..cd91b55 100644
22--- a/wscript_configure_system_gnutls
23+++ b/wscript_configure_system_gnutls
24@@ -39,6 +39,7 @@ if (parse_version(gnutls_version) > parse_version('3.6.14')):
25 if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'):
26 conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1)
27
28+"""
29 if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
30 conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
31 else:
32@@ -48,3 +49,4 @@ if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'):
33 conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1)
34 else:
35 Logs.warn('No gnutls support for AES CMAC')
36+"""
37--
382.17.1
39
diff --git a/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch b/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch
deleted file mode 100644
index d4ceb5ce9b..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From ba6bc5459cf148dd617fd9cd38dd50c3a9b5d706 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 31 May 2021 15:50:48 +0800
4Subject: [PATCH] source3/wscript: disable check fcntl F_OWNER_EX
5
6It fails on cross-compilation.
7
8Fixes configure error:
9 Checking whether fcntl supports flags to send direct I/O availability signals: UNKNOWN
10
11Upstream-Status: Inappropriate [embedded specific]
12
13Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14---
15 source3/wscript | 48 ------------------------------------------------
16 1 file changed, 48 deletions(-)
17
18diff --git a/source3/wscript b/source3/wscript
19index adc31ce..f6de0a6 100644
20--- a/source3/wscript
21+++ b/source3/wscript
22@@ -1168,54 +1168,6 @@ err:
23 #include <fcntl.h>
24 #include <unistd.h>
25 #include <stdlib.h>
26-#include <sys/socket.h>
27-
28-int main(void)
29-{
30- int sockfd, ret;
31- struct f_owner_ex owner, get_owner;
32-
33- sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
34- if (sockfd == -1) {
35- goto err;
36- }
37-
38- owner.type = F_OWNER_PID;
39- owner.pid = getpid();
40-
41- ret = fcntl(sockfd, F_SETOWN_EX, &owner);
42- if (ret == -1) {
43- goto err;
44- }
45-
46- ret = fcntl(sockfd, F_GETOWN_EX, &get_owner);
47- if (ret == -1) {
48- goto err;
49- }
50-
51- if (get_owner.type != F_OWNER_PID) {
52- goto err;
53- }
54-
55- if (get_owner.pid != getpid()) {
56- goto err;
57- }
58-
59- close(sockfd);
60- exit(0);
61-err:
62- close(sockfd);
63- exit(1);
64-}''',
65- 'HAVE_F_OWNER_EX',
66- addmain=False,
67- execute=True,
68- msg="Checking whether fcntl supports flags to send direct I/O availability signals")
69-
70- conf.CHECK_CODE('''
71-#include <fcntl.h>
72-#include <unistd.h>
73-#include <stdlib.h>
74 #include <stdint.h>
75
76 #define DATA "hinttest.fcntl"
77--
782.17.1
79
diff --git a/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch b/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch
deleted file mode 100644
index a0b7510346..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch
+++ /dev/null
@@ -1,92 +0,0 @@
1From 9942bca2e276c7b4c7696a08594258430c4c5bb5 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Thu, 3 Jun 2021 09:39:56 +0800
4Subject: [PATCH] source3/wscript: disable check fcntl RW_HINTS
5
6It fails on cross-compilation for musl.
7
8Fixes configure error:
9 Checking whether fcntl supports setting/geting hints: UNKNOWN
10
11Upstream-Status: Inappropriate [embedded specific]
12
13Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14---
15 source3/wscript | 61 -------------------------------------------------
16 1 file changed, 61 deletions(-)
17
18diff --git a/source3/wscript b/source3/wscript
19index f6de0a6..3e260c1 100644
20--- a/source3/wscript
21+++ b/source3/wscript
22@@ -1164,67 +1164,6 @@ err:
23 execute=True,
24 msg="Checking whether fcntl lock supports open file description locks")
25
26- conf.CHECK_CODE('''
27-#include <fcntl.h>
28-#include <unistd.h>
29-#include <stdlib.h>
30-#include <stdint.h>
31-
32-#define DATA "hinttest.fcntl"
33-
34-int main(void)
35-{
36- uint64_t hint, get_hint;
37- int fd;
38-
39- fd = open(DATA, O_RDONLY | O_CREAT | O_EXCL);
40- if (fd == -1) {
41- goto err;
42- }
43-
44- hint = RWH_WRITE_LIFE_SHORT;
45- int ret = fcntl(fd, F_SET_RW_HINT, &hint);
46- if (ret == -1) {
47- goto err;
48- }
49-
50- ret = fcntl(fd, F_GET_RW_HINT, &get_hint);
51- if (ret == -1) {
52- goto err;
53- }
54-
55- if (get_hint != RWH_WRITE_LIFE_SHORT) {
56- goto err;
57- }
58-
59- hint = RWH_WRITE_LIFE_EXTREME;
60- ret = fcntl(fd, F_SET_FILE_RW_HINT, &hint);
61- if (ret == -1) {
62- goto err;
63- }
64-
65- ret = fcntl(fd, F_GET_FILE_RW_HINT, &get_hint);
66- if (ret == -1) {
67- goto err;
68- }
69-
70- if (get_hint != RWH_WRITE_LIFE_EXTREME) {
71- goto err;
72- }
73-
74- close(fd);
75- unlink(DATA);
76- exit(0);
77-err:
78- close(fd);
79- unlink(DATA);
80- exit(1);
81-}''',
82- 'HAVE_RW_HINTS',
83- addmain=False,
84- execute=True,
85- msg="Checking whether fcntl supports setting/geting hints")
86-
87 conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec',
88 define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
89 conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec',
90--
912.17.1
92
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb
index 0a5dbe9c95..d51ec54d5c 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb
@@ -20,10 +20,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
20 file://0003-Add-config-option-without-valgrind.patch \ 20 file://0003-Add-config-option-without-valgrind.patch \
21 file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ 21 file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
22 file://0005-samba-build-dnsserver_common-code.patch \ 22 file://0005-samba-build-dnsserver_common-code.patch \
23 file://0006-samba-defeat-iconv-test.patch \
24 file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \
25 file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \
26 file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \
27 file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ 23 file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \
28 " 24 "
29 25