Commit Graph

31 Commits

Author SHA1 Message Date
Martchus d5e678d2ca Add builduser to same groups as on host
This prevents permission errors when relying on a user's group
for accessing certain files (made available within the container
via bind mounts).
2023-05-13 23:09:08 +02:00
Martchus 6b3628baff Log systemd-nspawn invocation parameters
When debugging it is useful to know what parameters where
used.
2023-05-13 23:09:08 +02:00
Martchus a49193bf6b Set TERM within the systemd-nspawn container in makechrootpkg
This is required by WINE to prevent
```
unknown: I need something more specific
```
2023-05-13 23:09:08 +02:00
Martchus cbe685d30d Adjust systemd-nspawn flags
* Remove --keep-unit since it causes sometimes errors and does not seem
  to be required
* Increase maximum number of open files (the default of 1000 is too less
  for some packages)
* Use /etc/resolv.conf from host (otherwise systemd-nspawn uses a config
  which does not work on my host setup)
2023-05-13 23:09:08 +02:00
Kevin Mihelich 0fb9e36580 makechrootpkg: don't delete MAKEFLAGS and PACKAGER 2023-05-13 23:09:08 +02:00
Kevin Mihelich e140d9792d archbuild: no setarch 2023-05-13 23:09:08 +02:00
Kevin Mihelich 56962ae607 makechrootpkg: no default logging 2023-05-13 23:09:08 +02:00
Kevin Mihelich 429c3b28c3 arch-nspawn: arm fix 2023-05-13 23:09:08 +02:00
Kevin Mihelich 79bf25d947 makechrootpkg: distcc 2023-05-13 23:09:08 +02:00
Kevin Mihelich 942f2da2f0 arch-nspawn: keep mirrorlist 2023-05-13 23:09:08 +02:00
Kevin Mihelich 28b363bff8 makechrootpkg: cache dir 2023-05-13 23:09:08 +02:00
Tobias Powalowski 0365edb264
fix: enable extglob before func definition for bash-5.2 compatibility
The `extglob` option changes the behavior of the shell parser, since
extended glob patterns would otherwise be syntax errors. bash-5.2
changed the way a function definition is processed by calling the parser
instead of relying on the ad-hoc code in bash-5.1 and earlier versions.
This means, in bash-5.2 the shell function was parsed without `extglob`
being enabled because the `shopt` command to enable it was part of the
function body.

Add `shopt` options for `extglob` around function definitions to address
this issue and allow bash-5.2 to correctly parse the function.

Co-authored-by: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>
Co-authored-by: Levente Polyak <anthraxx@archlinux.org>
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-06 21:51:27 +01:00
Evangelos Foutras 320c1fd0ac
mkarchroot: stop adding C.UTF-8 to locale.gen
Adding such an entry is problematic as it results in locale -a showing:

  C
  C.UTF-8
  C.utf8
  POSIX
  (other locales)

In the above, C.UTF-8 is built-in whereas C.utf8 comes from locale.gen.

The duplicate locale has the potential to expose undesired behavior in
upstream software: https://github.com/sudo-project/sudo/issues/241
2023-02-15 22:51:40 +02:00
Levente Polyak 7b209b63a7
commitpkg: abort execution if msg file editor exits none-successfully
Previously the script execution did not abort if the msg file editor
exited none-successfully leading to undesired commits with a potentially
unfinished message. Instead abort the commit if the msg file editor is
deliberately terminated with a failure code.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-01-17 00:48:24 +01:00
Levente Polyak d45e77738b
commitpkg: properly cleanup commit msg file on abort
Use the workdir location which gets cleaned up automatically. Previously
this was leaking tmpfiles if the commitpkg command got aborted after
file creation.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-01-17 00:47:20 +01:00
Celeste Liu 009c58f7c9
archbuild: add architecture-specific mount config
config path: @pkgdatadir@/mount.d/${arch}

config format:
Each line will start with 'ro' and 'rw' will be used, other lines will
be ignore, rest of line is out/path:in/path. e.g.

```
ro /some/path:/proc/cpuinfo
rw /some/some/path:/var/cache/pacman/pkg
```

For example, in the RISC-V port, if we use qemu-user to build, we need
to pass a parameter to makechrootpkg to map a correct /proc/cpuinfo, so
that software that relies on /proc/cpuinfo to obtain information can be
built normally.

Signed-off-by: Celeste Liu <CoelacanthusHex@gmail.com>
2023-01-06 16:58:29 +01:00
Felix Yan 112026580d
makechrootpkg: make /tmp inside nspawn larger
systemd by default limits the /tmp folder to be 10% of the host memory:
6f2cea06bf/src/shared/mount-util.h (L33)

This is problematic to our builds because many toolchains opt to put
build artifacts in /tmp, and expecting the host memory to be 10 times
larger is not optimal or even realistic sometimes.

This MR attempts to enlarge it to 50% memory as the host machine's
default value of /tmp. This should be a fair compromise between being
overly conservative and taking up too much memory to crash the system.
2023-01-06 16:25:46 +01:00
Morten Linderud a510331698
mkarchroot: remove deprecated -d option
It's been deprecated for a few years now.

91562aa99c

Signed-off-by: Morten Linderud <foxboron@archlinux.org>
2022-11-21 21:48:22 +01:00
Hugo Osvaldo Barrera dca8f91d26
makerepropkg: Use $CARCH instead of hardcoded x86_64
`makerepropkg` has a hardcoded "x86_64", so fails to run on other
[unofficial] architectures, because it tries to use an x86_64-specific
makepkg config, which overrides CARCH=x86_64.

This patch addresses hardcoded half of the problem; ArchLinux derivates
still needs to ship a custom `devtools` package with their own
`makepkg-$CARCH.conf`. Usually, the only thing that really needs to be
changed in the per-architecture custom makepkg.conf is CARCH and CHOST.

See: https://lists.archlinux.org/archives/list/arch-projects@lists.archlinux.org/thread/XEEW5LXYFN3XXI5YXAUY5E4LZLMKOFTL/
2022-11-08 22:25:32 +01:00
Mike Yuan d82bc69716
makechrootpkg: fix short option handling for makepkg_args
Currently, when multiple short options are passed as a single argument,
only the one that matches the first case statement will be parsed. This
shall be fixed by using switch-case resume.
2022-10-13 00:10:17 +08:00
Levente Polyak fcaf3ecec0
fix: do not set extglob globally to avoid side-effects
Instead only enable it for whatever operation requires them.

Example sides effects:
commitpkg can accidently execute PKGBUILD functions when sourcing the
PKGBUILD that has function names like package_libsigc++()

Fixes #87
2022-09-01 23:40:21 +02:00
Levente Polyak f8d2ad9a7d
diffpkg: pass the --color option appropriately to diffoscope
Diffoscope has a different option, called --text-color which only
understands the verbose options. Hence we extend the --color shorthand
for --color=auto and pass the changed option name to diffoscope.
2022-09-01 23:38:44 +02:00
Levente Polyak 2e4060445a
crossrepomove: fix moving debug packages to the target repo
We did not copy over the optional debug packages to the staging
environment before db-updating the moved state. Afterwards the db-remove
call removed the debug packages from the source repo. This lead to
dropping debug packages when using crossrepomove.

This approach ensures we have a uniform shell to avoid shell glob
behavior inconsistencies. The copy of the package path is mandatory and
will error out if missing while the debug package path is optional as
reflected by a subshell that succeeds either way.

Fixes #92
2022-08-31 23:55:05 +02:00
morganamilo 1e23bbc164
makechrootpkg: support -A makepkg flag 2022-08-31 23:38:13 +02:00
Levente Polyak 53be0527e2
fix: properly check for invalid argument in checkpkg and diffpkg
The option switch case only matches by splitting via '|' instead of ','
2022-08-31 02:26:47 +02:00
Levente Polyak f4e8047d65
diffpkg: prefer to search inside the pool dir if available
On certain packaging machines where the pacman cache gets updated very
infrequently, the behavior of diffpkg may not function correctly as old
packages were to be downloaded as diff target. In such cases we look for
a pool directory first and search via a glob for an available pool
package sorted by version.

The pool search glob has three glob segments each disallowing the dash
delimiter to split across pkgrel, pkgver and arch. This will return the
correct package from the pool without considering overly eager wildcards
that potentially match different pkgnames.

The default pool search directory is /srv/ftp/pool
2022-08-31 02:26:47 +02:00
Levente Polyak 70a3041ff8
diffpkg: allow to set column width for side-by-side view
The magic values `columns` and `auto` allow to set specific aspects,
with 'auto' as the default value:

- auto: Set width to the maximum line length of all input files
- columns: Set width to the shell defined $COLUMNS env var

Furthermore any number can be passed to set a static width.
2022-08-31 02:26:47 +02:00
Levente Polyak ba070f1ca9
diffpkg: add colored output option with default of auto 2022-08-23 20:23:51 +02:00
Levente Polyak b9dadc5576
diffpkg: allow to choose between unified context and two columns 2022-08-23 20:23:22 +02:00
Levente Polyak 37df0765d2
cleanup: move PKGBUILD.proto to contrib folder 2022-06-22 01:05:03 +02:00
Levente Polyak d94badcd0b
make: split out source files into src folder 2022-06-22 01:05:02 +02:00