helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: Remove samba related PYTHONHASHSEED patches and use export function

Browse Source 
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>
This commit is contained in:
persianpros 2023-01-01 20:17:35 +03:30 committed by Khem Raj
parent 18a9d6d386
commit 92deb5f329
10 changed files with 10 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta-networking/recipes-connectivity/samba/samba/0009-wscript-skip-checking-PYTHONHASHSEED.patch
View File

@ -1,30 +0,0 @@
From 342a233eb0abb00a4d6a0c824a1337ff71d93c32 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
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

3
meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
View File

@ -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 = " \

30
meta-networking/recipes-support/libldb/libldb/0004-wscript-skip-checking-PYTHONHASHSEED.patch
View File

@ -1,30 +0,0 @@
From 6e403b3bac2edadb67776434da54ac2fc2e8de04 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
buildtools/wafsamba/wscript | 4 ----
1 file changed, 4 deletions(-)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8729b08..a4d6f3e 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

3
meta-networking/recipes-support/libldb/libldb_2.6.1.bb
View File

@ -6,11 +6,12 @@ LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later"
DEPENDS += "libtdb libtalloc libtevent popt"
RDEPENDS:pyldb += "python3"
export PYTHONHASHSEED="1"
SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
file://0001-do-not-import-target-module-while-cross-compile.patch \
file://0002-ldb-Add-configure-options-for-packages.patch \
file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \
file://0004-wscript-skip-checking-PYTHONHASHSEED.patch \
"
SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch"

30
meta-networking/recipes-support/libtalloc/libtalloc/0003-wscript-skip-checking-PYTHONHASHSEED.patch
View File

@ -1,30 +0,0 @@
From 4a1b8659235dcac5382a627a4add4d636a65a886 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
buildtools/wafsamba/wscript | 4 ----
1 file changed, 4 deletions(-)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8729b08..a4d6f3e 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

3
meta-networking/recipes-support/libtalloc/libtalloc_2.3.4.bb
View File

@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \
"
export PYTHONHASHSEED="1"
SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
file://0001-talloc-Add-configure-options-for-packages.patch \
file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
file://0003-wscript-skip-checking-PYTHONHASHSEED.patch \
"
SRC_URI[sha256sum] = "179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505"

30
meta-networking/recipes-support/libtdb/libtdb/0003-wscript-skip-checking-PYTHONHASHSEED.patch
View File

@ -1,30 +0,0 @@
From b5864f0d542485c4fbfeb7b02fdd99e0b4e1dbc7 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
buildtools/wafsamba/wscript | 4 ----
1 file changed, 4 deletions(-)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8729b08..a4d6f3e 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

3
meta-networking/recipes-support/libtdb/libtdb_1.4.7.bb
View File

@ -6,10 +6,11 @@ LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \
file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6"
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://0003-wscript-skip-checking-PYTHONHASHSEED.patch \
"
SRC_URI[md5sum] = "bc27d5b20c7f013305c40b3bced43b3a"

30
meta-networking/recipes-support/libtevent/libtevent/0003-wscript-skip-checking-PYTHONHASHSEED.patch
View File

@ -1,30 +0,0 @@
From 406bb14337c71403c100ad8692e1fe99308030b7 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
buildtools/wafsamba/wscript | 4 ----
1 file changed, 4 deletions(-)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8729b08..a4d6f3e 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

3
meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb
View File

@ -6,10 +6,11 @@ LICENSE = "LGPL-3.0-or-later"
DEPENDS += "libtalloc libtirpc"
RDEPENDS:python3-tevent = "python3"
export PYTHONHASHSEED="1"
SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
file://0001-Add-configure-options-for-packages.patch \
file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
file://0003-wscript-skip-checking-PYTHONHASHSEED.patch \
"
SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch"