[merge] changes from master

- remove GIS

Makefile

@@ -1,4 +1,4 @@
-Version=0.15.10
+Version=0.15.12
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc

bin/mkchroot.in

@@ -115,11 +115,12 @@ if ${build_locales}; then
     printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
     printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
     printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
-fi
 
-chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} ${cache_dir:+-c "$cache_dir"} ${keep_flag})
+    chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} \
+                 ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} \
+                 ${cache_dir:+-c "$cache_dir"} ${keep_flag})
 
     exec chroot-run \
         ${chroot_args[*]} \
         "$working_dir" locale-gen
-
+fi

lib/util-iso-boot.sh

@@ -39,8 +39,8 @@ prepare_initramfs(){
 prepare_boot_extras(){
     cp $1/boot/amd-ucode.img $2/amd_ucode.img
     cp $1/boot/intel-ucode.img $2/intel_ucode.img
-    cp $1/usr/share/licenses/amd-ucode/LICENSE $2/amd_ucode.LICENSE
-    cp $1/usr/share/licenses/intel-ucode/LICENSE $2/intel_ucode.LICENSE
+    cp $1/usr/share/licenses/amd-ucode/LIC* $2/amd_ucode.LICENSE
+    cp $1/usr/share/licenses/intel-ucode/LIC* $2/intel_ucode.LICENSE
     cp $1/boot/memtest86+/memtest.bin $2/memtest
     cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING
 }

lib/util-iso.sh

@@ -198,6 +198,10 @@ make_iso() {
     touch "${iso_root}/.miso"
     for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do
         if [[ "${sfs_dir}" != "${work_dir}" ]]; then
+            if [[ -e "${sfs_dir}"/etc/pacman.d/gnupg ]]; then
+                msg2 "Removing '/etc/pacman.d/gnupg' folder from ${sfs_dir}"
+                rm -rf "${sfs_dir}"/etc/pacman.d/gnupg
+            fi
             make_sfs "${sfs_dir}"
         fi
     done
@@ -363,6 +367,9 @@ make_image_desktop() {
 
         seed_snaps ${path}
         
+        echo "Enable os-prober"
+        sed -i -e 's,.*GRUB_DISABLE_OS_PROBER=.*,GRUB_DISABLE_OS_PROBER=false,' "${path}/etc/default/grub"
+
         umount_fs
         clean_up_image "${path}"
         : > ${work_dir}/build.${FUNCNAME}
@@ -403,8 +410,6 @@ make_image_live() {
 
         umount_fs
 
-        # Clean up GnuPG keys
-        rm -rf "${path}/etc/pacman.d/gnupg"
         clean_up_image "${path}"
         : > ${work_dir}/build.${FUNCNAME}
         msg "Done [Live installation] (livefs)"