From 92deb5f329e77e9f8dfcc390b7d3f6e7a733c4c7 Mon Sep 17 00:00:00 2001 From: persianpros Date: Sun, 1 Jan 2023 20:17:35 +0330 Subject: 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 --- ...0009-wscript-skip-checking-PYTHONHASHSEED.patch | 30 ---------------------- .../recipes-connectivity/samba/samba_4.17.4.bb | 3 ++- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch (limited to 'meta-networking/recipes-connectivity/samba') 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 @@ -From 342a233eb0abb00a4d6a0c824a1337ff71d93c32 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 28 Dec 2022 16:31:05 +0800 -Subject: [PATCH] wscript: skip checking PYTHONHASHSEED - -Skip checking PYTHONHASHSEED as it is set to 0 in oe-core by default. - -Signed-off-by: Yi Zhao ---- - buildtools/wafsamba/wscript | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index 1c55428..01b242d 100644 ---- a/buildtools/wafsamba/wscript -+++ b/buildtools/wafsamba/wscript -@@ -8,10 +8,6 @@ import wafsamba - from samba_utils import symlink - from optparse import SUPPRESS_HELP - --phs = os.environ.get("PYTHONHASHSEED", None) --if phs != "1": -- raise Errors.WafError('''PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!''') -- - # this forces configure to be re-run if any of the configure - # sections of the build scripts change. We have to check - # for this in sys.argv as options have not yet been parsed when --- -2.25.1 - 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 \ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ " +export PYTHONHASHSEED="1" + SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://smb.conf \ file://volatiles.03_samba \ @@ -23,7 +25,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ file://0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch \ file://0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ - file://0009-wscript-skip-checking-PYTHONHASHSEED.patch \ " SRC_URI:append:libc-musl = " \ -- cgit v1.2.3-54-g00ecf