- Pacman-dev - lists.archlinux.org

RFC: alternate approach to split packages
by Allan McRae 11 Jan '25

11 Jan '25

Hi all, When package splitting was implemented in makepkg, it was done so under two premises: 1) Arch Linux did not split packages out of principle, and there would be very few exceptions 2) KDE was the target package to be split, and its build system provided nice make targets for doing so This meant we targetted splitting packages where upstream provided direct methods for installing the split components. So looking like: pkgname=('pkg1' 'pkg2') package_pkg1() { cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg1 } package_pkg2() { cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg2 } As time went by, Arch started splitting packages more - mostly to avoid pulling large dependencies onto a system for wider components. Packagers even started using (abusing) optional dependencies to avoid splitting. The current splitting approach leads to monstrosities like the Arch Linux gcc PKGBUILD [1] (of which I completely blame the current packagers and take no responsibility!). Recently, some packagers have been using a custom _pick function [2] to allow them to move specified files from the first package's "make install" and save them for a later split package. The _pick approach is more similar to how rpm/deb approaches work, but relies on the (non-guaranteed) stability of makepkg internals. I have roughly implemented an additional approach to package splitting that will improve this situation. Essentially, the "make install" is done in the stash() function, and the files are stashed for future use in packaging. The individual package_*() functions then provide the files to include in the package in a "filelist" array. This array allows the '*' wildcard, and '!' to exclude files. A simple example: pkgname=('foo' 'foo-docs') stash() { cd $pkgbase-$pkgver make DESTDIR=$stashdir install } package_foo() { filelist=('*' '!usr/share/docs/') ... } package_foo-docs() { filelist=('usr/share/docs/') ... } I'm seeking feedback on this approach before I finish the implementation and push this. Either replying to the email, or on the gitlab snippet [3]. Thanks! Allan [1] https://gitlab.archlinux.org/archlinux/packaging/packages/gcc/-/blob/main/P… [2] https://gitlab.archlinux.org/archlinux/packaging/packages/gvfs/-/blob/main/… [3] https://gitlab.archlinux.org/-/snippets/3770

1 0

[Git][pacman/pacman][master] 2 commits: Add accessor for handle->disable_sandbox
by Allan McRae (＠allan) 10 Jan '25

10 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: e6b3eb25 by Allan McRae at 2025-01-10T04:36:49+00:00 Add accessor for handle->disable_sandbox Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - e65b7d42 by Allan McRae at 2025-01-10T04:36:49+00:00 Add accessor for handle->disable_dl_timeout Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - lib/libalpm/alpm.h - lib/libalpm/handle.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/7ccf316ceb767ddbd2c967… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/7ccf316ceb767ddbd2c967… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Provide a default sandboxuser
by Allan McRae (＠allan) 10 Jan '25

10 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: 7ccf316c by Allan McRae at 2025-01-09T12:14:25+10:00 Provide a default sandboxuser If sandboxuser is not set, pacman/libalpm does not handle moving incomplete download files out of the temporary download directories and into the cache. This leave download_XXXXXX directories in the cache that cause warnings on -Sc operations. Initialise the sandboxuser with the username of UID 0 (root on most systems). Fixes #209. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - lib/libalpm/alpm.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/7ccf316ceb767ddbd2c967a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/7ccf316ceb767ddbd2c967a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman.conf.5: replace {sysconfdir} with /etc in code block
by Allan McRae (＠allan) 08 Jan '25

08 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: ae603e35 by Allan McRae at 2025-01-08T14:25:09+10:00 pacman.conf.5: replace {sysconfdir} with /etc in code block Variable replacements are not performed on code blocks leaving the example Include usage with '{sysconfdir}/pacman.d/mirrorlist'. Replace this with '/etc' consistent with other example blocks in the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - doc/pacman.conf.5.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ae603e35d7f60e686109ca0… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ae603e35d7f60e686109ca0… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Remove executable permissions from source file
by Allan McRae (＠allan) 08 Jan '25

08 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: 4908eed5 by Allan McRae at 2025-01-08T03:08:18+00:00 Remove executable permissions from source file Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/lint_config/source_date_epoch.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/4908eed57dd837a53f5ceb8… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/4908eed57dd837a53f5ceb8… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 2 commits: lint_config: ensure NPROC is set to something usable
by Allan McRae (＠allan) 08 Jan '25

08 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: cc87999d by Allan McRae at 2025-01-08T03:06:37+00:00 lint_config: ensure NPROC is set to something usable We use NPROC for managing the number of parallel jobs to run, so it is essentially that this is a valid number. Add a lint pass, and move the setting of the default value to this location. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 286e776e by Allan McRae at 2025-01-08T03:06:37+00:00 lint_config: move PACKAGER check into its own function The check for the format of the PACKAGER variable did not align with the rest of the function where it was located. Move to its own function. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 4 changed files: - scripts/libmakepkg/lint_config/meson.build - + scripts/libmakepkg/lint_config/nproc.sh.in - + scripts/libmakepkg/lint_config/packager.sh.in - scripts/libmakepkg/lint_config/variable.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/425ff046edb861b52cce9f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/425ff046edb861b52cce9f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] doc/BUILDINFO: Fix description of arrays
by Allan McRae (＠allan) 04 Jan '25

04 Jan '25

Allan McRae pushed to branch master at Pacman / Pacman Commits: 425ff046 by Johan Förberg at 2025-01-03T16:12:30+01:00 doc/BUILDINFO: Fix description of arrays Signed-off-by: Johan Förberg <johan(a)forberg.se> - - - - - 1 changed file: - doc/BUILDINFO.5.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/425ff046edb861b52cce9fa… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/425ff046edb861b52cce9fa… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 4 commits: libmakepkg: strip - add "safe_" prefix to stripping functions
by Allan McRae (＠allan) 28 Dec '24

28 Dec '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 0c136ecc by Allan McRae at 2024-12-28T13:54:27+00:00 libmakepkg: strip - add "safe_" prefix to stripping functions Add a "safe_" prefix to strip_file() and strip_lto() to indicate that these functions are taking extra steps to ensure permissions remain unchanged. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - dbde37aa by Vasiliy Stelmachenok at 2024-12-28T13:54:27+00:00 libmakepkg: strip - split handling of hardlinks Handle singly and muptiply hard-linked files separately. Also collect information on hard linked files to avoid searching the entire package to check for hard links. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 02b35b91 by Vasiliy Stelmachenok at 2024-12-28T13:54:27+00:00 libmakepkg: strip - parallelize stripping of files Perform file stripping in parallel where possible. Hardlinks remain processed one at a time due to reproducibility issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 5f4c7e3d by Allan McRae at 2024-12-28T13:54:27+00:00 libmakepkg: strip - disguard error messages when copying source files Parallel processing of file stripping is causing a TOC/TOU race when copying source files into the debug location resulting in error messages from cp. While hiding this error is not the ideal solution, it is currently the only one we have. Given this is a error of our own making, and we understand the cause and have determined there is zero actual downside to ignoring the error, we will accept this approach until something better is found. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - scripts/libmakepkg/tidy/strip.sh.in - scripts/makepkg.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/5e2a763e4a9f25fa4cdc58… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/5e2a763e4a9f25fa4cdc58… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] libmakepkg: improve validity checking of arch array
by Allan McRae (＠allan) 22 Dec '24

22 Dec '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 5e2a763e by Allan McRae at 2024-12-20T14:21:32+10:00 libmakepkg: improve validity checking of arch array Only a subset of checks were being performed on the overridden arch arrays in package functions. Refactor checking such that all checks are perform on all arch arrays. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/libmakepkg/lint_pkgbuild/arch.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/5e2a763e4a9f25fa4cdc585… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/5e2a763e4a9f25fa4cdc585… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] makepkg.conf.5: fix typo
by Allan McRae (＠allan) 18 Dec '24

18 Dec '24

Allan McRae pushed to branch master at Pacman / Pacman Commits: 62d31921 by Diego Viola at 2024-12-18T05:24:40+00:00 makepkg.conf.5: fix typo - - - - - 1 changed file: - doc/makepkg.conf.5.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/62d3192126ad6d75a037ea1… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/62d3192126ad6d75a037ea1… You're receiving this email because of your account on gitlab.archlinux.org.

1 0