| Message ID | 20240101074958.2782143-1-yi.zhao@windriver.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-networking,1/5] libtdb: upgrade 1.4.8 -> 1.4.9 | expand |
Ping... On 1/1/24 15:49, Yi Zhao wrote: > According to samba release planning[1], 4.18 is already in maintenance > mode and will be EOL in Sep 2024. Upgrade to current stable release > 4.19. > > Release Notes > https://www.samba.org/samba/history/samba-4.19.0.html > https://www.samba.org/samba/history/samba-4.19.3.html > > [1] https://wiki.samba.org/index.php/Samba_Release_Planning > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > --- > .../cross-answers-aarch64.txt | 2 +- > .../cross-answers-aarch64_be.txt | 2 +- > .../waf-cross-answers/cross-answers-arm.txt | 2 +- > .../waf-cross-answers/cross-answers-armeb.txt | 2 +- > .../waf-cross-answers/cross-answers-i586.txt | 2 +- > .../waf-cross-answers/cross-answers-i686.txt | 2 +- > .../waf-cross-answers/cross-answers-mips.txt | 2 +- > .../cross-answers-mips64.txt | 2 +- > .../cross-answers-mips64el.txt | 2 +- > .../cross-answers-mipsel.txt | 2 +- > .../cross-answers-powerpc.txt | 2 +- > .../cross-answers-powerpc64.txt | 2 +- > .../cross-answers-powerpc64le.txt | 2 +- > .../cross-answers-riscv32.txt | 2 +- > .../cross-answers-riscv64.txt | 2 +- > .../cross-answers-x86_64.txt | 2 +- > .../0001-Don-t-check-xsltproc-manpages.patch | 8 ++--- > ...rt-target-module-while-cross-compile.patch | 10 +++--- > ...3-Add-config-option-without-valgrind.patch | 34 +++++++++++-------- > ...tions-to-configure-the-use-of-libbsd.patch | 9 ++--- > ...-pyext_PATTERN-for-cross-compilation.patch | 6 ++-- > ...orture-skip-test-case-tfork_cmd_send.patch | 2 +- > ...-of-python-to-fix-the-install-confli.patch | 11 +++--- > .../samba/samba-4.3.9-remove-getpwent_r.patch | 8 ++--- > .../samba/samba/samba-pam.patch | 12 +++---- > .../{samba_4.18.9.bb => samba_4.19.3.bb} | 6 ++-- > 26 files changed, 73 insertions(+), 65 deletions(-) > rename meta-networking/recipes-connectivity/samba/{samba_4.18.9.bb => samba_4.19.3.bb} (98%) > > 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 fa960ea2b..ea561073e 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 fa960ea2b..ea561073e 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 > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 19d0b6f76..5655a6585 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 19d0b6f76..5655a6585 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 19d0b6f76..5655a6585 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 19d0b6f76..5655a6585 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 aa8736880..84816e06f 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 407e4154c..cdf7169cb 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 407e4154c..cdf7169cb 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 aa8736880..84816e06f 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 e94a5a473..c563a2796 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 a5c0d0d61..31a27e246 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 a5c0d0d61..31a27e246 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 19d0b6f76..5655a6585 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt > @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 fa960ea2b..ea561073e 100644 > --- a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt > +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: 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 fa960ea2b..ea561073e 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 > @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO > Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK > Checking value of GNUTLS_MAC_AES_CMAC_128: OK > Checking whether fcntl supports flags to send direct I/O availability signals: NO > -Checking whether fcntl supports setting/geting hints: NO > +Checking whether fcntl supports setting/getting hints: NO > Checking for readlink breakage: NO > Checking for gnutls fips mode support: NO > diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch > index 9f597bee2..a498348c2 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch > @@ -1,4 +1,4 @@ > -From f6fa33bfc2e1272198db6ea08910b4162b364b18 Mon Sep 17 00:00:00 2001 > +From 5c5418038e392cc00d3293e00ea0cd20b5e19c9a Mon Sep 17 00:00:00 2001 > From: Bian Naimeng <biannm@cn.fujitsu.com> > Date: Mon, 18 Apr 2016 17:00:53 -0400 > Subject: [PATCH] Don't check xsltproc manpages > @@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lib/ldb/wscript b/lib/ldb/wscript > -index 60bb7cf..b7b0152 100644 > +index ed5d45f..de3c648 100644 > --- a/lib/ldb/wscript > +++ b/lib/ldb/wscript > @@ -144,7 +144,7 @@ def configure(conf): > @@ -29,7 +29,7 @@ index 60bb7cf..b7b0152 100644 > # we need this for the ldap backend > if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): > diff --git a/lib/talloc/wscript b/lib/talloc/wscript > -index 3089663..76cd65e 100644 > +index 075f1ec..9bd9f73 100644 > --- a/lib/talloc/wscript > +++ b/lib/talloc/wscript > @@ -48,7 +48,7 @@ def configure(conf): > @@ -42,7 +42,7 @@ index 3089663..76cd65e 100644 > conf.CHECK_HEADERS('sys/auxv.h') > conf.CHECK_FUNCS('getauxval') > diff --git a/lib/tdb/wscript b/lib/tdb/wscript > -index 71ada31..accd474 100644 > +index 5e6a928..f13cf2a 100644 > --- a/lib/tdb/wscript > +++ b/lib/tdb/wscript > @@ -95,7 +95,7 @@ def configure(conf): > diff --git a/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch > index 3b0269092..b0ad5c414 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch > @@ -1,4 +1,4 @@ > -From f7b8e2e149b06a8033e31f4242c392573fa9ab52 Mon Sep 17 00:00:00 2001 > +From ba492aead265edfd1da2a6c45dd7661c248309cb Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Tue, 25 Jun 2019 14:25:08 +0800 > Subject: [PATCH] do not import target module while cross compile > @@ -6,18 +6,18 @@ Subject: [PATCH] do not import target module while cross compile > Some modules such as dynamic library maybe cann't be imported > while cross compile, we just check whether does the module exist. > > +Upstream-Status: Pending > + > Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> > > update to version 4.10.5, and switch to python3 > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > -Upstream-Status: Pending > - > buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- > 1 file changed, 19 insertions(+), 8 deletions(-) > > diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py > -index 7d2d855..01dcb56 100644 > +index 2300565..26d9e8c 100644 > --- a/buildtools/wafsamba/samba_bundled.py > +++ b/buildtools/wafsamba/samba_bundled.py > @@ -4,6 +4,7 @@ import sys > @@ -28,7 +28,7 @@ index 7d2d855..01dcb56 100644 > > def PRIVATE_NAME(bld, name): > '''possibly rename a library to include a bundled extension''' > -@@ -241,17 +242,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): > +@@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): > # versions > minversion = minimum_library_version(conf, libname, minversion) > > diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch > index f2e25eb10..2c9d29c9f 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch > @@ -1,4 +1,4 @@ > -From 556bb3cf17ccdf0b0ee0d82801c4b20cf0990ae4 Mon Sep 17 00:00:00 2001 > +From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Thu, 20 Jun 2019 14:11:16 +0800 > Subject: [PATCH] Add config option without-valgrind > @@ -9,38 +9,44 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> > > Update patch to version 4.10.5 > Signed-off-by: Changqing Li <changqing.li@windriver.com> > + > +Rebase to 4.19.3 > +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > --- > lib/replace/wscript | 5 +++-- > - wscript | 4 ++++ > - 2 files changed, 7 insertions(+), 2 deletions(-) > + wscript | 7 +++++++ > + 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/lib/replace/wscript b/lib/replace/wscript > -index 2f17999..9ef9bd9 100644 > +index 37d7759..9dd9b48 100644 > --- a/lib/replace/wscript > +++ b/lib/replace/wscript > -@@ -114,8 +114,9 @@ def configure(conf): > +@@ -113,8 +113,9 @@ def configure(conf): > conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') > conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') > > - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') > -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') > -+ if not Options.options.disable_valgrind: > +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') > ++ if Options.options.enable_valgrind: > + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') > -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') > ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') > conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') > conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') > conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') > diff --git a/wscript b/wscript > -index 3af4207..54d7e9e 100644 > +index 95ddd9e..6d9577a 100644 > --- a/wscript > +++ b/wscript > -@@ -116,6 +116,10 @@ def options(opt): > - help=("Disable RELRO builds"), > - action="store_false", dest='enable_relro') > +@@ -123,6 +123,13 @@ def options(opt): > + help=('Disable kernely keyring support for credential storage'), > + action='store_false', dest='enable_keyring') > > ++ opt.add_option('--with-valgrind', > ++ help=("Enable use of valgrind"), > ++ action="store_true", dest='enable_valgrind') > + opt.add_option('--without-valgrind', > -+ help=("Disable use of the valgrind headers"), > -+ action="store_true", dest='disable_valgrind', default=False) > ++ help=("Disable use of valgrind"), > ++ action="store_false", dest='enable_valgrind', default=False) > + > gr = opt.option_group('developer options') > > diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch > index 2b0fbff8e..c72bd133e 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch > @@ -1,9 +1,10 @@ > -From 515f2455b4b69f5fcd2c61a532663280785db737 Mon Sep 17 00:00:00 2001 > +From d302d9a4ac6eb2bbafd248064a878ba287d636b8 Mon Sep 17 00:00:00 2001 > From: Peter Kjellerstedt <pkj@axis.com> > Date: Tue, 28 Apr 2020 02:05:33 +0200 > Subject: [PATCH] Add options to configure the use of libbsd > > Upstream-Status: Inappropriate [oe deterministic build specific] > + > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > Rebase to 4.14.4 > @@ -15,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > 3 files changed, 29 insertions(+), 15 deletions(-) > > diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript > -index 8729b08..1c55428 100644 > +index 30cb366..d167551 100644 > --- a/buildtools/wafsamba/wscript > +++ b/buildtools/wafsamba/wscript > @@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), > @@ -33,10 +34,10 @@ index 8729b08..1c55428 100644 > > gr.add_option('-C', > diff --git a/lib/replace/wscript b/lib/replace/wscript > -index 9ef9bd9..d47de4f 100644 > +index 9dd9b48..a22ae59 100644 > --- a/lib/replace/wscript > +++ b/lib/replace/wscript > -@@ -439,20 +439,21 @@ def configure(conf): > +@@ -444,20 +444,21 @@ def configure(conf): > > strlcpy_in_bsd = False > > diff --git a/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch > index e1b5fac0d..53ef21948 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch > @@ -1,4 +1,4 @@ > -From a8b4a40b535a2c69eb408f649e7169bcc1975fc1 Mon Sep 17 00:00:00 2001 > +From d2a2d0f82a37d0bf21123671774b0b03ffa976cf Mon Sep 17 00:00:00 2001 > From: Yi Zhao <yi.zhao@windriver.com> > Date: Wed, 24 Nov 2021 13:33:35 +0800 > Subject: [PATCH] Fix pyext_PATTERN for cross compilation > @@ -46,10 +46,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py > -index a23bd01..af202e0 100644 > +index b2dd1a9..2bd3545 100644 > --- a/third_party/waf/waflib/Tools/python.py > +++ b/third_party/waf/waflib/Tools/python.py > -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): > +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): > x = 'MACOSX_DEPLOYMENT_TARGET' > if dct[x]: > env[x] = conf.environ[x] = str(dct[x]) > diff --git a/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch b/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch > index cc4c15e09..13fbd3595 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch > @@ -1,4 +1,4 @@ > -From 950b5977ea7e72343067d0070cc35fb0dc5163d4 Mon Sep 17 00:00:00 2001 > +From 4fd04fc7c94d6981f3409d088ab8d32c48460010 Mon Sep 17 00:00:00 2001 > From: Yi Zhao <yi.zhao@windriver.com> > Date: Thu, 25 Aug 2022 16:46:04 +0800 > Subject: [PATCH] smbtorture: skip test case tfork_cmd_send > diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch > index 45a7c82d8..e3506adfb 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch > @@ -1,4 +1,4 @@ > -From f783bb9c87ce11e824dfefca473d0dcf6edad238 Mon Sep 17 00:00:00 2001 > +From bf5552f937c745940081e29ef32d52ae26bfd8c1 Mon Sep 17 00:00:00 2001 > From: Lei Maohui <leimaohui@fujitsu.com> > Date: Sun, 30 Oct 2022 11:59:31 +0900 > Subject: [PATCH] Deleted settiong of python to fix the install conflict error > @@ -22,7 +22,8 @@ sys.path.insert(0, "/usr/lib/python3.10/site-packages") > But this setting is for environment when running from source tree. There > is no necessary on target. > > -Upstream-Status: Inappropriate > +Upstream-Status: Inappropriate [embedded specific] > + > Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> > --- > source4/scripting/bin/samba-gpupdate | 1 - > @@ -47,7 +48,7 @@ index 4b3f057..08fec2d 100755 > import optparse > from samba import getopt as options > diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool > -index f8a70a6..3c818de 100755 > +index b02ad4d..f69ae10 100755 > --- a/source4/scripting/bin/samba-tool > +++ b/source4/scripting/bin/samba-tool > @@ -22,7 +22,6 @@ > @@ -59,7 +60,7 @@ index f8a70a6..3c818de 100755 > # make sure the script dies immediately when hitting control-C, > # rather than raising KeyboardInterrupt. As we do all database > diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate > -index 1ce53f5..2cdfbf8 100755 > +index 69821e2..4037870 100755 > --- a/source4/scripting/bin/samba_dnsupdate > +++ b/source4/scripting/bin/samba_dnsupdate > @@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' > @@ -95,7 +96,7 @@ index 67d801e..2fc0d6a 100755 > import optparse > import time > diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate > -index 84ff771..b6fe041 100755 > +index b421886..5e18ad9 100755 > --- a/source4/scripting/bin/samba_spnupdate > +++ b/source4/scripting/bin/samba_spnupdate > @@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' > diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch > index 9a83574e6..0c967be62 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch > @@ -1,4 +1,4 @@ > -From 08003ea30d86a8b983be89f6a161d3baacdaa038 Mon Sep 17 00:00:00 2001 > +From e5d9527e6b3b386229747f799c725fcd68bc5228 Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > Date: Sun, 6 Nov 2016 23:40:54 -0800 > Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() > @@ -7,15 +7,15 @@ Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() > Taken from gentoo > http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > Upstream-Status: Pending > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +--- > source4/torture/local/nss_tests.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c > -index 2943122..bc185ca 100644 > +index e911aa2..2b39b74 100644 > --- a/source4/torture/local/nss_tests.c > +++ b/source4/torture/local/nss_tests.c > @@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, > diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch > index 9bf1f9757..4fcbb4757 100644 > --- a/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch > +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch > @@ -1,22 +1,22 @@ > -From 6822c61ade5617c9f109e32ad4cdc115fa9e12c8 Mon Sep 17 00:00:00 2001 > +From c533bdced677e2104565fc06602e7e63d9c79ac0 Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > Date: Sun, 6 Nov 2016 23:40:54 -0800 > Subject: [PATCH] Lifted from gentoo and ported to 4.4.5 > > http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > Upstream-Status: Pending > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +--- > source3/wscript | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/source3/wscript b/source3/wscript > -index 22be17a..ee9ce52 100644 > +index b7f96f3..ed12b1e 100644 > --- a/source3/wscript > +++ b/source3/wscript > -@@ -862,7 +862,7 @@ msg.msg_accrightslen = sizeof(fd); > +@@ -863,7 +863,7 @@ msg.msg_accrightslen = sizeof(fd); > if conf.env.with_iconv: > conf.DEFINE('HAVE_ICONV', 1) > > @@ -25,7 +25,7 @@ index 22be17a..ee9ce52 100644 > use_pam=True > conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') > if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): > -@@ -939,6 +939,17 @@ int i; i = PAM_RADIO_TYPE; > +@@ -940,6 +940,17 @@ int i; i = PAM_RADIO_TYPE; > "or headers not found. Use --without-pam to disable " > "PAM support."); > > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.18.9.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.3.bb > similarity index 98% > rename from meta-networking/recipes-connectivity/samba/samba_4.18.9.bb > rename to meta-networking/recipes-connectivity/samba/samba_4.19.3.bb > index 73ceb7b75..4828526ed 100644 > --- a/meta-networking/recipes-connectivity/samba/samba_4.18.9.bb > +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.3.bb > @@ -31,9 +31,9 @@ SRC_URI:append:libc-musl = " \ > file://samba-4.3.9-remove-getpwent_r.patch \ > " > > -SRC_URI[sha256sum] = "f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245" > +SRC_URI[sha256sum] = "280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96" > > -UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" > +UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" > > inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig > > @@ -85,7 +85,7 @@ PACKAGECONFIG[sasl] = ",,cyrus-sasl" > PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" > PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" > PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" > -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," > +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" > PACKAGECONFIG[lttng] = "--with-lttng,--without-lttng,lttng-ust" > PACKAGECONFIG[archive] = "--with-libarchive,--without-libarchive,libarchive" > PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#107982): https://lists.openembedded.org/g/openembedded-devel/message/107982 > Mute This Topic: https://lists.openembedded.org/mt/103459767/7283133 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [yi.zhao@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch index 93a85e854..477b1cec7 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From d3b1d23e01e323b9610843ab6bef096512f6c244 Mon Sep 17 00:00:00 2001 +From 613cfb43622f0138edfcf3ad7a8fecc568e17db4 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Wed, 19 Jun 2019 17:53:34 +0800 Subject: [PATCH] tdb: Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] tdb: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -18,16 +17,20 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Update to 1.4.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 1.4.9 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 92 ++++++++++++++++++++++++++++++++++----------- - wscript | 6 +++ - 2 files changed, 77 insertions(+), 21 deletions(-) + lib/replace/wscript | 79 +++++++++++++++++++++++++++++++++------------ + wscript | 6 ++++ + 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 827d74f..70cde6f 100644 +index 199e636..cb13b62 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -25,6 +25,41 @@ def options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -45,13 +48,6 @@ index 827d74f..70cde6f 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -69,51 +65,45 @@ index 827d74f..70cde6f 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,12 +66,21 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') -+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,9 +158,10 @@ def configure(conf): + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +150,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -- conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -+ ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') - conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h') -@@ -431,20 +480,21 @@ def configure(conf): +@@ -443,20 +481,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +140,7 @@ index 827d74f..70cde6f 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 71ada31..10b16a7 100644 +index 5e6a928..5443b43 100644 --- a/wscript +++ b/wscript @@ -69,6 +69,12 @@ def options(opt): diff --git a/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 6bd118b53..00ec8a477 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 10b4546edb194ede7a5e8bb5e4c9f5fdc67984eb Mon Sep 17 00:00:00 2001 +From de39c696a62894fd9c6626d3e2931e42e3407be5 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-networking/recipes-support/libtdb/libtdb/run-ptest b/meta-networking/recipes-support/libtdb/libtdb/run-ptest new file mode 100644 index 000000000..7bc56f77c --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'tdb1-*') + +for f in replace_testsuite $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb similarity index 71% rename from meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb rename to meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb index 5dc87bd91..248b72967 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb @@ -11,9 +11,10 @@ export PYTHONHASHSEED="1" SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://0001-tdb-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI[sha256sum] = "8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8" +SRC_URI[sha256sum] = "0ac226073e3a2db8648da7af744cb95f50766a52feeb001d558b2b321b74a765" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -22,17 +23,16 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" S = "${WORKDIR}/tdb-${PV}" -inherit waf-samba +inherit waf-samba pkgconfig ptest -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ @@ -42,6 +42,15 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/tdb1-* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/test + install -m 0644 ${B}/test/*.tdb ${D}${PTEST_PATH}/tests/test/ + install -m 0644 ${B}/test/*.corrupt ${D}${PTEST_PATH}/tests/test/ +} + PACKAGES += "tdb-tools python3-tdb" RPROVIDES:${PN}-dbg += "python3-tdb-dbg"
* Remove PACKAGECONFIG[libaio] as libaio is no longer required by libtdb. * Add ptest. * Refresh patches. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...b-Add-configure-options-for-packages.patch | 48 ++++++++----------- ...-pyext_PATTERN-for-cross-compilation.patch | 6 +-- .../recipes-support/libtdb/libtdb/run-ptest | 17 +++++++ .../{libtdb_1.4.8.bb => libtdb_1.4.9.bb} | 19 ++++++-- 4 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 meta-networking/recipes-support/libtdb/libtdb/run-ptest rename meta-networking/recipes-support/libtdb/{libtdb_1.4.8.bb => libtdb_1.4.9.bb} (71%)