Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/portage/isos-qemu/env/releng/, ...
Date: Mon, 06 Sep 2021 18:09:05
Message-Id: 1630951216.d55ade03fef6053389e9646463eecdebede3ea7d.dilfridge@gentoo
1 commit: d55ade03fef6053389e9646463eecdebede3ea7d
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 6 18:00:16 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 6 18:00:16 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d55ade03
7
8 Copy qemu-specific config into isos-qemu
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 releases/portage/isos-qemu/env/releng/forcelfs | 2 ++
13 releases/portage/isos-qemu/env/releng/nosandbox | 1 +
14 releases/portage/isos-qemu/env/releng/qemu | 1 +
15 releases/portage/isos-qemu/package.env/releng/all | 1 +
16 .../portage/isos-qemu/package.env/releng/forcelfs | 1 +
17 .../portage/isos-qemu/package.env/releng/glibc | 1 +
18 releases/portage/isos-qemu/package.use/libpcre | 5 +++
19 releases/portage/isos-qemu/package.use/no-asm | 1 +
20 .../python:3.10/compileall-singlethreaded.patch | 41 ++++++++++++++++++++++
21 .../python:3.8/compileall-singlethreaded.patch | 41 ++++++++++++++++++++++
22 .../python:3.9/compileall-singlethreaded.patch | 41 ++++++++++++++++++++++
23 11 files changed, 136 insertions(+)
24
25 diff --git a/releases/portage/isos-qemu/env/releng/forcelfs b/releases/portage/isos-qemu/env/releng/forcelfs
26 new file mode 100644
27 index 00000000..398e2b71
28 --- /dev/null
29 +++ b/releases/portage/isos-qemu/env/releng/forcelfs
30 @@ -0,0 +1,2 @@
31 +CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
32 +CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
33
34 diff --git a/releases/portage/isos-qemu/env/releng/nosandbox b/releases/portage/isos-qemu/env/releng/nosandbox
35 new file mode 100644
36 index 00000000..7a02010b
37 --- /dev/null
38 +++ b/releases/portage/isos-qemu/env/releng/nosandbox
39 @@ -0,0 +1 @@
40 +FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox -sandbox -usersandbox"
41
42 diff --git a/releases/portage/isos-qemu/env/releng/qemu b/releases/portage/isos-qemu/env/releng/qemu
43 new file mode 100644
44 index 00000000..de86517d
45 --- /dev/null
46 +++ b/releases/portage/isos-qemu/env/releng/qemu
47 @@ -0,0 +1 @@
48 +FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
49
50 diff --git a/releases/portage/isos-qemu/package.env/releng/all b/releases/portage/isos-qemu/package.env/releng/all
51 new file mode 100644
52 index 00000000..60c290a8
53 --- /dev/null
54 +++ b/releases/portage/isos-qemu/package.env/releng/all
55 @@ -0,0 +1 @@
56 +*/* releng/qemu
57
58 diff --git a/releases/portage/isos-qemu/package.env/releng/forcelfs b/releases/portage/isos-qemu/package.env/releng/forcelfs
59 new file mode 100644
60 index 00000000..7e1943c6
61 --- /dev/null
62 +++ b/releases/portage/isos-qemu/package.env/releng/forcelfs
63 @@ -0,0 +1 @@
64 +dev-util/cmake releng/forcelfs
65
66 diff --git a/releases/portage/isos-qemu/package.env/releng/glibc b/releases/portage/isos-qemu/package.env/releng/glibc
67 new file mode 100644
68 index 00000000..bf1f6f93
69 --- /dev/null
70 +++ b/releases/portage/isos-qemu/package.env/releng/glibc
71 @@ -0,0 +1 @@
72 +sys-libs/glibc releng/nosandbox
73
74 diff --git a/releases/portage/isos-qemu/package.use/libpcre b/releases/portage/isos-qemu/package.use/libpcre
75 new file mode 100644
76 index 00000000..84d84b54
77 --- /dev/null
78 +++ b/releases/portage/isos-qemu/package.use/libpcre
79 @@ -0,0 +1,5 @@
80 +# required by sys-libs/libselinux-2.7
81 +dev-libs/libpcre static-libs
82 +
83 +# required by dev-vcs/git
84 +dev-libs/libpcre2 jit
85
86 diff --git a/releases/portage/isos-qemu/package.use/no-asm b/releases/portage/isos-qemu/package.use/no-asm
87 new file mode 100644
88 index 00000000..1beb2353
89 --- /dev/null
90 +++ b/releases/portage/isos-qemu/package.use/no-asm
91 @@ -0,0 +1 @@
92 +dev-libs/libgcrypt -asm
93
94 diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch
95 new file mode 100644
96 index 00000000..27ab38ba
97 --- /dev/null
98 +++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.10/compileall-singlethreaded.patch
99 @@ -0,0 +1,41 @@
100 +diff --git a/Makefile.pre.in b/Makefile.pre.in
101 +index 4924dedc35..75eb66be3c 100644
102 +--- a/Makefile.pre.in
103 ++++ b/Makefile.pre.in
104 +@@ -1432,30 +1432,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
105 + fi
106 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
107 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
108 +- -j0 -d $(LIBDEST) -f \
109 ++ -d $(LIBDEST) -f \
110 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
111 + $(DESTDIR)$(LIBDEST)
112 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
113 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
114 +- -j0 -d $(LIBDEST) -f \
115 ++ -d $(LIBDEST) -f \
116 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
117 + $(DESTDIR)$(LIBDEST)
118 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
119 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
120 +- -j0 -d $(LIBDEST) -f \
121 ++ -d $(LIBDEST) -f \
122 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
123 + $(DESTDIR)$(LIBDEST)
124 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
125 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
126 +- -j0 -d $(LIBDEST)/site-packages -f \
127 ++ -d $(LIBDEST)/site-packages -f \
128 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
129 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
130 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
131 +- -j0 -d $(LIBDEST)/site-packages -f \
132 ++ -d $(LIBDEST)/site-packages -f \
133 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
134 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
135 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
136 +- -j0 -d $(LIBDEST)/site-packages -f \
137 ++ -d $(LIBDEST)/site-packages -f \
138 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
139 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
140 + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
141
142 diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch
143 new file mode 100644
144 index 00000000..27ab38ba
145 --- /dev/null
146 +++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.8/compileall-singlethreaded.patch
147 @@ -0,0 +1,41 @@
148 +diff --git a/Makefile.pre.in b/Makefile.pre.in
149 +index 4924dedc35..75eb66be3c 100644
150 +--- a/Makefile.pre.in
151 ++++ b/Makefile.pre.in
152 +@@ -1432,30 +1432,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
153 + fi
154 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
155 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
156 +- -j0 -d $(LIBDEST) -f \
157 ++ -d $(LIBDEST) -f \
158 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
159 + $(DESTDIR)$(LIBDEST)
160 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
161 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
162 +- -j0 -d $(LIBDEST) -f \
163 ++ -d $(LIBDEST) -f \
164 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
165 + $(DESTDIR)$(LIBDEST)
166 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
167 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
168 +- -j0 -d $(LIBDEST) -f \
169 ++ -d $(LIBDEST) -f \
170 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
171 + $(DESTDIR)$(LIBDEST)
172 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
173 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
174 +- -j0 -d $(LIBDEST)/site-packages -f \
175 ++ -d $(LIBDEST)/site-packages -f \
176 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
177 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
178 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
179 +- -j0 -d $(LIBDEST)/site-packages -f \
180 ++ -d $(LIBDEST)/site-packages -f \
181 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
182 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
183 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
184 +- -j0 -d $(LIBDEST)/site-packages -f \
185 ++ -d $(LIBDEST)/site-packages -f \
186 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
187 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
188 + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
189
190 diff --git a/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch b/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch
191 new file mode 100644
192 index 00000000..27ab38ba
193 --- /dev/null
194 +++ b/releases/portage/isos-qemu/patches/dev-lang/python:3.9/compileall-singlethreaded.patch
195 @@ -0,0 +1,41 @@
196 +diff --git a/Makefile.pre.in b/Makefile.pre.in
197 +index 4924dedc35..75eb66be3c 100644
198 +--- a/Makefile.pre.in
199 ++++ b/Makefile.pre.in
200 +@@ -1432,30 +1432,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
201 + fi
202 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
203 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
204 +- -j0 -d $(LIBDEST) -f \
205 ++ -d $(LIBDEST) -f \
206 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
207 + $(DESTDIR)$(LIBDEST)
208 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
209 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
210 +- -j0 -d $(LIBDEST) -f \
211 ++ -d $(LIBDEST) -f \
212 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
213 + $(DESTDIR)$(LIBDEST)
214 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
215 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
216 +- -j0 -d $(LIBDEST) -f \
217 ++ -d $(LIBDEST) -f \
218 + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
219 + $(DESTDIR)$(LIBDEST)
220 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
221 + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
222 +- -j0 -d $(LIBDEST)/site-packages -f \
223 ++ -d $(LIBDEST)/site-packages -f \
224 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
225 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
226 + $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
227 +- -j0 -d $(LIBDEST)/site-packages -f \
228 ++ -d $(LIBDEST)/site-packages -f \
229 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
230 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
231 + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
232 +- -j0 -d $(LIBDEST)/site-packages -f \
233 ++ -d $(LIBDEST)/site-packages -f \
234 + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
235 + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
236 + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt