mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
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>
This commit is contained in:
-30
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user