summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/samba
diff options
context:
space:
mode:
authorpersianpros <persianpros@yahoo.com>2023-01-01 20:17:35 +0330
committerKhem Raj <raj.khem@gmail.com>2023-01-01 10:00:20 -0800
commit92deb5f329e77e9f8dfcc390b7d3f6e7a733c4c7 (patch)
treecd13f185bc4647d3bd7a1ed204c6b19750e8a16d /meta-networking/recipes-connectivity/samba
parent18a9d6d38615e298f41dc8f44da4bada9858801e (diff)
downloadmeta-openembedded-92deb5f329e77e9f8dfcc390b7d3f6e7a733c4c7.tar.gz
samba: Remove samba related PYTHONHASHSEED patches and use export function
With export PYTHONHASHSEED="1" there will be no need for patching samba and its related libs So easier maintenance and a cleaner OE Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba')
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch30
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.17.4.bb3
2 files changed, 2 insertions, 31 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch b/meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch
deleted file mode 100644
index af659a1e53..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 342a233eb0abb00a4d6a0c824a1337ff71d93c32 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 28 Dec 2022 16:31:05 +0800
4Subject: [PATCH] wscript: skip checking PYTHONHASHSEED
5
6Skip checking PYTHONHASHSEED as it is set to 0 in oe-core by default.
7
8Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
9---
10 buildtools/wafsamba/wscript | 4 ----
11 1 file changed, 4 deletions(-)
12
13diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
14index 1c55428..01b242d 100644
15--- a/buildtools/wafsamba/wscript
16+++ b/buildtools/wafsamba/wscript
17@@ -8,10 +8,6 @@ import wafsamba
18 from samba_utils import symlink
19 from optparse import SUPPRESS_HELP
20
21-phs = os.environ.get("PYTHONHASHSEED", None)
22-if phs != "1":
23- raise Errors.WafError('''PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!''')
24-
25 # this forces configure to be re-run if any of the configure
26 # sections of the build scripts change. We have to check
27 # for this in sys.argv as options have not yet been parsed when
28--
292.25.1
30
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb b/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
index b79d23c2dd..966eaf9bf9 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
@@ -12,6 +12,8 @@ ${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \
12${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ 12${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \
13" 13"
14 14
15export PYTHONHASHSEED="1"
16
15SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ 17SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
16 file://smb.conf \ 18 file://smb.conf \
17 file://volatiles.03_samba \ 19 file://volatiles.03_samba \
@@ -23,7 +25,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
23 file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ 25 file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \
24 file://0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch \ 26 file://0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch \
25 file://0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ 27 file://0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch \
26 file://0009-wscript-skip-checking-PYTHONHASHSEED.patch \
27 " 28 "
28 29
29SRC_URI:append:libc-musl = " \ 30SRC_URI:append:libc-musl = " \