[util.sh] update os-release path

Makefile

@@ -32,9 +32,6 @@ ARCH_CONF = \
 	data/make.conf.d/i686.conf \
 	data/make.conf.d/x86_64.conf \
 	data/make.conf.d/multilib.conf
-# 	data/make.conf.d/aarch64.conf \
-# 	data/make.conf.d/armv6h.conf \
-# 	data/make.conf.d/armv7h.conf
 
 BIN_PKG = \
 	bin/checkpkg \
@@ -186,14 +183,6 @@ install_iso:
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools
 	install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/manjaro-tools
 
-# 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/initcpio/hooks
-# 	install -m0755 ${CPIOHOOKS} $(DESTDIR)$(PREFIX)/lib/initcpio/hooks
-#
-# 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/initcpio/install
-# 	install -m0755 ${CPIOINST} $(DESTDIR)$(PREFIX)/lib/initcpio/install
-
-# 	install -m0755 ${CPIO} $(DESTDIR)$(PREFIX)/lib/initcpio
-
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
 	install -m0755 ${CPIOHOOKS} $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
 

bin/mkchrootpkg.in

@@ -213,7 +213,6 @@ prepare_chroot() {
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
-Defaults env_keep += "HOME"
 builduser ALL = NOPASSWD: /usr/bin/pacman
 EOF
     chmod 440 "$copydir/etc/sudoers.d/builduser-pacman"
@@ -276,6 +275,12 @@ move_products() {
     for pkgfile in "$copydir"/pkgdest/*; do
         chown "$src_owner" "$pkgfile"
         mv "$pkgfile" "$PKGDEST"
+
+        # Fix broken symlink because of temporary chroot PKGDEST /pkgdest
+        if [[ "$PWD" != "$PKGDEST" && -L "$PWD/${pkgfile##*/}" ]]; then
+            rm "$PWD/${pkgfile##*/}"
+            ln -sf "$PKGDEST/${pkgfile##*/}"
+        fi
     done
 
     for l in "$copydir"/logdest/*; do

data/deploy.map

@@ -1,5 +0,0 @@
-# srv path : version attribute
-
-release:none
-
-development:alpha[0-9],beta[0-9],rc[0-9]

data/make.conf.d/aarch64.conf

@@ -1,3 +0,0 @@
-carch="aarch64"
-chost="aarch64-unknown-linux-gnu"
-cflags="-march=armv8-a -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

data/make.conf.d/armv6h.conf

@@ -1,3 +0,0 @@
-carch="armv6h"
-chost="armv6l-unknown-linux-gnueabihf"
-cflags="-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

data/make.conf.d/armv7h.conf

@@ -1,3 +0,0 @@
-carch="armv7h"
-chost="armv7l-unknown-linux-gnueabihf"
-cflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

lib/util-iso-boot.sh

@@ -108,13 +108,13 @@ prepare_efi_loader(){
     vars_to_boot_conf $2/loader/loader.conf
     cp ${efi_data}/uefi-shell-v{1,2}-x86_64.conf ${entries}
 
-    local drv='free' switch="no"
+    local label='free' switch="no"
     cp ${efi_data}/entry-x86_64-$3.conf ${entries}/${iso_name}-x86_64.conf
-    vars_to_boot_conf "${entries}/${iso_name}-x86_64.conf" "$drv" "$switch"
+    vars_to_boot_conf "${entries}/${iso_name}-x86_64.conf" "$label" "$switch"
     if ${nonfree_mhwd};then
-        drv='nonfree' switch="yes"
+        label='nonfree' switch="yes"
         cp ${efi_data}/entry-x86_64-$3.conf ${entries}/${iso_name}-x86_64-nonfree.conf
-        vars_to_boot_conf "${entries}/${iso_name}-x86_64-nonfree.conf" "$drv" "$switch"
+        vars_to_boot_conf "${entries}/${iso_name}-x86_64-nonfree.conf" "$label" "$switch"
     fi
 }
 

lib/util-iso-image.sh

@@ -214,8 +214,8 @@ configure_thus(){
     echo "DISTRIBUTION_VERSION = \"${dist_release}\"" >> "$conf"
     echo "SHORT_NAME = \"${dist_name}\"" >> "$conf"
     echo "[install]" >> "$conf"
-    echo "LIVE_MEDIA_SOURCE = \"/run/miso/bootmnt/${iso_name}/${target_arch}/root-image.sfs\"" >> "$conf"
-    echo "LIVE_MEDIA_DESKTOP = \"/run/miso/bootmnt/${iso_name}/${target_arch}/desktop-image.sfs\"" >> "$conf"
+    echo "LIVE_MEDIA_SOURCE = \"/run/miso/bootmnt/${iso_name}/${target_arch}/rootfs.sfs\"" >> "$conf"
+    echo "LIVE_MEDIA_DESKTOP = \"/run/miso/bootmnt/${iso_name}/${target_arch}/desktopfs.sfs\"" >> "$conf"
     echo "LIVE_MEDIA_TYPE = \"squashfs\"" >> "$conf"
     echo "LIVE_USER_NAME = \"${username}\"" >> "$conf"
     echo "KERNEL = \"${kernel}\"" >> "$conf"

lib/util-pkg.sh

@@ -60,7 +60,6 @@ prepare_conf(){
 }
 
 pkgver_equal() {
-    local left right
 
     if [[ $1 = *-* && $2 = *-* ]]; then
         # if both versions have a pkgrel, then they must be an exact match
@@ -98,7 +97,7 @@ get_full_version() {
 find_cached_package() {
     local searchdirs=("$PWD" "$PKGDEST") results=()
     local targetname=$1 targetver=$2 targetarch=$3
-    local dir pkg pkgbasename pkgparts name ver rel arch size r results
+    local dir pkg pkgbasename name ver rel arch r results
 
     for dir in "${searchdirs[@]}"; do
         [[ -d $dir ]] || continue

lib/util.sh

@@ -270,17 +270,17 @@ get_distid(){
 }
 
 get_disturl(){
-    source /etc/os-release
+    source /usr/lib/os-release
     echo "${HOME_URL}"
 }
 
 get_osname(){
-    source /etc/os-release
+    source /usr/lib/os-release
     echo "${NAME}"
 }
 
 get_osid(){
-    source /etc/os-release
+    source /usr/lib/os-release
     echo "${ID}"
 }
 
@@ -419,7 +419,7 @@ load_profile_config(){
 
     [[ -z ${pxe_boot} ]] && pxe_boot="true"
 
-    [[ -z ${plymouth_boot} ]] && plymouth_boot="true"
+    [[ -z ${plymouth_boot} ]] && plymouth_boot="false"
 
     [[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"