1From bf5552f937c745940081e29ef32d52ae26bfd8c1 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Sun, 30 Oct 2022 11:59:31 +0900
4Subject: [PATCH] Deleted settiong of python to fix the install conflict error
5 when enable multilib.
6
7  file /usr/bin/samba-tool conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
8  file /usr/sbin/samba-gpupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
9  file /usr/sbin/samba_dnsupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
10  file /usr/sbin/samba_downgrade_db conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
11  file /usr/sbin/samba_kcc conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
12  file /usr/sbin/samba_spnupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
13  file /usr/sbin/samba_upgradedns conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686
14
15The conflict is because there is a  difference between of lib32-samba-* and samba-* as the following:
1664bit:
17sys.path.insert(0, "/usr/lib64/python3.10/site-packages")
18
1932bit:
20sys.path.insert(0, "/usr/lib/python3.10/site-packages")
21
22But this setting is for environment when running from source tree. There
23is no necessary on target.
24
25Upstream-Status: Inappropriate [embedded specific]
26
27Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
28---
29 source4/scripting/bin/samba-gpupdate     | 1 -
30 source4/scripting/bin/samba-tool         | 1 -
31 source4/scripting/bin/samba_dnsupdate    | 1 -
32 source4/scripting/bin/samba_downgrade_db | 1 -
33 source4/scripting/bin/samba_kcc          | 1 -
34 source4/scripting/bin/samba_spnupdate    | 1 -
35 source4/scripting/bin/samba_upgradedns   | 1 -
36 7 files changed, 7 deletions(-)
37
38diff --git a/source4/scripting/bin/samba-gpupdate b/source4/scripting/bin/samba-gpupdate
39index 4b3f057..08fec2d 100755
40--- a/source4/scripting/bin/samba-gpupdate
41+++ b/source4/scripting/bin/samba-gpupdate
42@@ -25,7 +25,6 @@ applied, have changed, or is in the right container'''
43 import os
44 import sys
45
46-sys.path.insert(0, "bin/python")
47
48 import optparse
49 from samba import getopt as options
50diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
51index b02ad4d..f69ae10 100755
52--- a/source4/scripting/bin/samba-tool
53+++ b/source4/scripting/bin/samba-tool
54@@ -22,7 +22,6 @@
55 import sys
56
57 # Find right direction when running from source tree
58-sys.path.insert(0, "bin/python")
59
60 # make sure the script dies immediately when hitting control-C,
61 # rather than raising KeyboardInterrupt. As we do all database
62diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
63index 69821e2..4037870 100755
64--- a/source4/scripting/bin/samba_dnsupdate
65+++ b/source4/scripting/bin/samba_dnsupdate
66@@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1'
67 os.environ["TZ"] = "GMT"
68
69 # Find right directory when running from source tree
70-sys.path.insert(0, "bin/python")
71
72 import samba
73 import optparse
74diff --git a/source4/scripting/bin/samba_downgrade_db b/source4/scripting/bin/samba_downgrade_db
75index b9a0909..80f581e 100755
76--- a/source4/scripting/bin/samba_downgrade_db
77+++ b/source4/scripting/bin/samba_downgrade_db
78@@ -23,7 +23,6 @@ import optparse
79 import sys
80
81 # Find right directory when running from source tree
82-sys.path.insert(0, "bin/python")
83
84
85 import samba
86diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc
87index 67d801e..2fc0d6a 100755
88--- a/source4/scripting/bin/samba_kcc
89+++ b/source4/scripting/bin/samba_kcc
90@@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1'
91 os.environ["TZ"] = "GMT"
92
93 # Find right directory when running from source tree
94-sys.path.insert(0, "bin/python")
95
96 import optparse
97 import time
98diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
99index b421886..5e18ad9 100755
100--- a/source4/scripting/bin/samba_spnupdate
101+++ b/source4/scripting/bin/samba_spnupdate
102@@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1'
103 os.environ["TZ"] = "GMT"
104
105 # Find right directory when running from source tree
106-sys.path.insert(0, "bin/python")
107
108 import samba, ldb
109 import optparse
110diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
111index afc5807..727a3cc 100755
112--- a/source4/scripting/bin/samba_upgradedns
113+++ b/source4/scripting/bin/samba_upgradedns
114@@ -27,7 +27,6 @@ import grp
115 from base64 import b64encode
116 import shlex
117
118-sys.path.insert(0, "bin/python")
119
120 import ldb
121 import samba
122--
1232.25.1
124
125