From 40543f9fcfca570db9fd50cb9c61df88e58bd89f Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Sat, 14 Jan 2023 20:23:59 +0100 Subject: [PATCH] add support for shared profile use Our profiles have a lot of duplicated packages in their profiles. So add support for a shared profile, that has all the packages that needs to be installed on all profiles, so we can clean up the profiles in the future. See https://gitlab.manjaro.org/manjaro-arm/applications/manjaro-arm-tools/-/merge_requests/15 for the Manjaro ARM Tools MR for the same thing. Signed-off-by: Dan Johansen --- manjaro-arm-installer | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index dde08dd..aea7b19 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -148,7 +148,7 @@ create_install() { mkdir -p $TMPDIR/pkg-cache mount -o bind $TMPDIR/pkg-cache $TMPDIR/root/var/cache/pacman/pkg # Install device and editions specific packages - $NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release systemd systemd-libs $PKG_EDITION $PKG_DEVICE --noconfirm + $NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release systemd systemd-libs $PKG_SHARED $PKG_EDITION $PKG_DEVICE --noconfirm info "Enabling services..." @@ -1066,6 +1066,7 @@ installer_getarmprofiles sed -i 's/pico-wizard-plamo-scripts//g' $TMPDIR/arm-profiles/editions/$EDITION sed -i 's/pico-wizard-git//g' $TMPDIR/arm-profiles/editions/$EDITION PKG_DEVICE=$(grep "^[^#;]" $TMPDIR/arm-profiles/devices/$DEVICE | awk '{print $1}') +PKG_SHARED=$(grep "^[^#;]" $TMPDIR/arm-profiles/editions/shared | awk '{sub(/>pinephone/,""); print $1}') case "$DEVICE" in pinephone) PKG_EDITION=$(grep "^[^#;]" $TMPDIR/arm-profiles/editions/$EDITION | awk '{sub(/>pinephone/,""); print $1}')