-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
lib distro-specific.sh: move armbian GPG to more common location #8128
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
lib distro-specific.sh: move armbian GPG to more common location #8128
Conversation
WalkthroughThe change modifies the filename used for the Armbian APT signing keyring in the Suggested labels
✨ Finishing Touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Nitpick comments (1)
lib/functions/rootfs/distro-specific.sh (1)
164-165
: Align Armbian GPG key path and enhancegpg --dearmor
invocation
TheAPT_SIGNING_KEY_FILE
variable now points to/usr/share/keyrings/armbian-archive-keyring.gpg
, which correctly follows Debian/Ubuntu conventions. To improve consistency and robustness:
- Scope the variable locally within the function to avoid polluting the global namespace:
-APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg" +declare APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg"
- Make the dearmor step non-interactive by adding
--batch
(and--yes
if desired) to prevent unexpected prompts during automated builds:-gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}" +gpg --batch --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"Finally, please verify that the corresponding
armbian-common
package indeed installs the de-armored key (or symlink from the oldarmbian.gpg
path) at this new location on target systems.
3f42216
to
91ae22d
Compare
The armbian GPG key should be at /usr/share/keyrings/armbian-archive-keyring.gpg not /usr/share/keyrings/armbian.gpg, I think. That'd be in line with where Ubuntu and Debian ship theirs.
I've already made a change in APA for the armbian-common package to ship the key in the new location but make a symlink from the old and hence work with both scenarios.