Repository navigation
bootstrap-arch: package the 4 DKMS modules via makepkg, not make install - #26
Open
pirsqr-rnd wants to merge 1 commit into
Open
pirsqr-rnd wants to merge 1 commit into
pirsqr-rnd wants to merge 1 commit into
Conversation
install_modules() called 'make -C modules/$m install' directly, bypassing the Arch PKGBUILDs added in modules/*/packaging/arch/ - unlike install_sensor_proxy(), which already builds and installs iio-sensor-proxy through makepkg + pacman -U. Consequence: re-running this script (which GUIDE.md documents as safe to do any time, e.g. after a kernel upgrade) would silently overwrite pacman-managed module installs with unpackaged files under /usr/src, desyncing the pacman database. Rewrote install_modules() to mirror install_sensor_proxy()'s makepkg + pacman -U pattern for all four modules. Added clean_unpackaged_dkms_source()/clean_unpackaged_file() so a prior 'make install' (raw DKMS, not a package) is migrated in place on first run instead of conflicting with pacman -U - verified this is a no-op once a module is already pacman-owned, and that the actual migration path works end-to-end (manually walked all four modules through dkms remove + rm -rf /usr/src/... + makepkg -si on this machine, including the goodix_9110_cfg.bin firmware file conflict this same helper now handles automatically). Syntax-checked with bash -n; not run end-to-end as root since the manual walkthrough already exercised the equivalent commands.
3 tasks done
Contributor
Author
|
FYI: closed #19 — it was on the same branch (my fork's |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
install_modules()callsmake -C modules/$m installdirectly for the four DKMS modules, bypassing the Arch PKGBUILDs already present undermodules/*/packaging/arch/— unlikeinstall_sensor_proxy(), which builds and installsiio-sensor-proxythroughmakepkg+pacman -U.Consequence: re-running this script — which the guide documents as safe to do at any time, e.g. after a kernel upgrade leaves the running kernel no longer installed — silently overwrites any pacman-managed module install with unpackaged files under
/usr/src, desyncing the pacman database.This rewrites
install_modules()to mirrorinstall_sensor_proxy()'smakepkg+pacman -Upattern for all four modules, and adds two small helpers:clean_unpackaged_dkms_source()— if a module was previously installed the old way (rawmake install, not a package), removes the stale DKMS registration and/usr/src/<name>-<version>directory before packaging, sopacman -Udoesn't hit "file exists". No-op once a module is already pacman-owned.clean_unpackaged_file()— same idea for the one standalone file outside/usr/src(goodix_9110_cfg.bin), which hit exactly this conflict in testing (see below).Testing: ran the equivalent commands by hand on a CachyOS machine with all four modules previously installed via the old raw
make installpath (two kernels: 6.18.52 LTS + 7.2.7 current) —dkms remove+rm -rf /usr/src/...+makepkg -sifor each module. All four migrated cleanly to pacman-tracked*-dkmspackages, built and loaded correctly on both kernels, module functionality (touchpad, keyboard backlight, EC, touchscreen) verified working afterward. Thegoodix_9110_cfg.binconflict this PR'sclean_unpackaged_file()handles is exactly the one hit manually before adding that helper.Not run end-to-end as root via the script itself, since the manual walkthrough already exercised the equivalent commands on the same module set.