-
Notifications
You must be signed in to change notification settings - Fork 598
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
alarm/devtools-alarm: Remove -d option from pacstrap
An upstream update dropped the deprecated -d option from pacstrap, which broke mkarchroot in devtools-alarm. Apply the upstream devtools patch to fix this issue. Bug report reference: https://archlinuxarm.org/forum/viewtopic.php?f=15&t=16282
- Loading branch information
Nicolas F
committed
Dec 22, 2022
1 parent
9b83681
commit 3fc765a
Showing
2 changed files
with
38 additions
and
4 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
alarm/devtools-alarm/0010-remove-deprecated-d-option.patch
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From a510331698bb13ca11ccd7db3f9beef75f87744c Mon Sep 17 00:00:00 2001 | ||
From: Morten Linderud <foxboron@archlinux.org> | ||
Date: Mon, 21 Nov 2022 10:51:02 +0100 | ||
Subject: [PATCH] mkarchroot: remove deprecated -d option | ||
|
||
It's been deprecated for a few years now. | ||
|
||
https://github.com/archlinux/arch-install-scripts/commit/91562aa99cd8237a2dec1aff5101949e40bf7d75 | ||
|
||
Signed-off-by: Morten Linderud <foxboron@archlinux.org> | ||
--- | ||
src/mkarchroot.in | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/mkarchroot.in b/src/mkarchroot.in | ||
index d199bed..45ad19c 100644 | ||
--- a/src/mkarchroot.in | ||
+++ b/src/mkarchroot.in | ||
@@ -81,7 +81,7 @@ for file in "${files[@]}"; do | ||
cp "$file" "$working_dir$file" | ||
done | ||
|
||
-unshare --mount pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ | ||
+unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \ | ||
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' | ||
|
||
printf '%s.UTF-8 UTF-8\n' C en_US de_DE > "$working_dir/etc/locale.gen" | ||
-- | ||
GitLab | ||
|
This file contains 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