Commit 24e2ce9
authored
Tell the musl container which world it is building (#181)
There are three cmake invocations in build-host.sh: stage 1, the staged path,
and the musl container, which builds its arguments as a string of its own
inside the container. The profile reached the first two.
So a musl stage 2 configured without it, took the default world, and wrote a
makepkg.conf saying CARCH=vita into a sysroot whose version_info.txt was
copied from a softfp stage 1. validate-core-package.sh refused the result:
world mismatch: version_info.txt says vita-softfp,
bin/makepkg.conf CARCH says vita
which is the check doing its job, an hour into the build.
Pass it into the container and into that string. The test counts the
invocations that carry the profile and checks the container is handed it,
since a variable that never enters expands to nothing there.1 parent 90bd8e9 commit 24e2ce9
2 files changed
Lines changed: 23 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
250 | 250 | | |
251 | 251 | | |
252 | 252 | | |
| 253 | + | |
253 | 254 | | |
254 | 255 | | |
255 | 256 | | |
| |||
284 | 285 | | |
285 | 286 | | |
286 | 287 | | |
287 | | - | |
| 288 | + | |
288 | 289 | | |
289 | 290 | | |
290 | 291 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
151 | 172 | | |
0 commit comments