modify(makepkg.conf): Flags. Use comma separated list

config/makepkg/x86_64.conf

@@ -44,8 +44,7 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-         -Wl,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
 RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems

src/lib/iso/calamares.sh

@@ -8,30 +8,25 @@ yaml_array() {
     local array yaml
 
     for entry in "$@"; do
-        yaml="{name: ${entry}, action: enable}"
+        yaml="{name: ${entry}, action: enable, alias: add, target: default}"
         array="${array:-}${array:+,} ${yaml}"
     done
     printf "%s\n" "[${array}]"
 }
 
 configure_calamares(){
-    for config in online offline; do
-        local mods="$1/etc/calamares-$config/modules"
-        if [[ -d "$mods" ]];then
-            msg2 "Configuring: Calamares %s" "$config"
+    local mods="$1/etc/calamares/modules"
+    if [[ -d "$mods" ]];then
+        msg2 "Configuring: Calamares"
 
-            if [[ -f "$mods"/services-artix.conf ]]; then
-                local svc
-                svc=$(yaml_array "${SERVICES[@]}") \
-                    yq -P 'with(.;
-                            .command = "artix-service" |
-                            .services = env(svc) )' \
-                        -i "$mods"/services-artix.conf
-            fi
+        if [[ -f "$mods"/services-artix.conf ]]; then
+            local svc init
+            init="${INITSYS}" svc=$(yaml_array "${SERVICES[@]}") \
+                yq -P 'with(.;
+                        .manager = env(init) |
+                        .services = env(svc) )' \
+                    -i "$mods"/services-artix.conf
         fi
-    done
-    if [[ -d "$1"/etc/calamares-offline ]]; then
-        ln -sf calamares-offline "$1"/etc/calamares
     fi
 }