Merge tag 'v1.5.6' into sisyphus

Makefile

@@ -2,6 +2,14 @@
 # iterate over multiple goals/arches,
 # collect proceedings
 
+ifeq (,$(CHECK))
+ifeq (,$(DEBUG))
+ifneq (,$(REPORT))
+$(warning REPORT is disabled, DEBUG must be enabled for this)
+endif
+endif
+endif
+
 ifndef BRANCH
 BRANCH := $(shell rpm --eval %_priority_distbranch | cut -d _ -f 1)
 export BRANCH
@@ -69,7 +77,7 @@ SHELL = /bin/bash
 			fi; \
 			say "** ARCH: $$ARCH"; \
 		fi; \
-		if [ -n "$(REPORT)" ]; then \
+		if [ -n "$(REPORT)" ] && [ -n "$(DEBUG)" ] && [ -z "$(CHECK)" ]; then \
 			REPORT_PATH=$$(mktemp --tmpdir mkimage-profiles.report.XXXXXXX); \
 			$(MAKE) -f main.mk ARCH=$$ARCH $@ | report-filter > $$REPORT_PATH || exit 1; \
 			$(MAKE) -f reports.mk ARCH=$$ARCH REPORT=$(REPORT) REPORT_PATH=$$REPORT_PATH; \

conf.d/education.mk

@@ -33,6 +33,26 @@ endif
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,THE_LISTS,$(call tags,base extra))
 
+mixin/education-lite: \
+	use/kernel/desktop use/kernel/net use/kernel/laptop \
+	use/firmware use/firmware/wireless use/firmware/laptop \
+	+systemd +systemd-optimal \
+	use/services \
+	use/ntp/chrony \
+	use/apt-conf/branch \
+	+x11 use/x11/3d \
+	use/x11/lightdm/gtk +pulse \
+	+nm use/x11/gtk/nm \
+	use/xdg-user-dirs/deep \
+	use/browser/chromium
+	@$(call set,BRANDING,alt-education)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
+	@$(call add,THE_LISTS,slinux/xfce-base)
+	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)                            
+	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,THE_LISTS,$(call tags,base regular))
+	@$(call add,THE_LISTS,$(call tags,base extra))
 ifeq (distro,$(IMAGE_CLASS))
 
 mixin/education-live: \
@@ -56,6 +76,21 @@ endif
 	@$(call add,LIVE_LISTS,$(call tags,base extra))
 	@$(call add,CONTROL,tcb_chkpwd:tcb)
 
+mixin/education-lite-live: \
+	use/live/suspend \
+	use/live/repo use/live/x11 use/live/rw \
+	use/grub/timeout/1 use/syslinux/timeout/10 \
+	use/cleanup/live-no-cleanupdb
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_PACKAGES,mc-full)
+	@$(call add,LIVE_PACKAGES,mousepad)
+	@$(call add,LIVE_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,LIVE_LISTS,education/live-lite)
+	@$(call add,CONTROL,tcb_chkpwd:tcb)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call set,GRUB_DEFAULT,session)
+	@$(call set,SYSLINUX_DEFAULT,session)
+
 mixin/education-base: \
 	use/l10n/default/ru_RU +vmguest \
 	+efi use/efi/shell \
@@ -78,6 +113,24 @@ mixin/education-base: \
 	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
 	@$(call add,STAGE2_PACKAGES,chrony)
 
+mixin/education-lite-base: \
+	use/l10n/default/ru_RU +vmguest \
+	+efi use/efi/shell \
+	use/isohybrid use/luks \
+	use/install2/fonts \
+	use/wireless \
+	+plymouth \
+	use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
+	@$(call set,INSTALLER,education)
+	@$(call set,META_VOL_ID,ALT Education 10.1 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_VOL_SET,ALT)
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+
 mixin/education-installer: \
 	+installer \
 	use/install2/repo \
@@ -112,6 +165,9 @@ mixin/education-installer: \
 distro/alt-education-live: distro/.base mixin/education-live \
 	mixin/education-base mixin/education use/branding/full; @:
 
+distro/alt-education-lite-live: distro/.base mixin/education-lite-live \
+	mixin/education-lite-base mixin/education-lite use/branding/full; @:
+
 distro/education: distro/alt-education; @:
 distro/alt-education: distro/.installer \
 	mixin/education \

conf.d/kworkstation.mk

@@ -12,7 +12,7 @@ mixin/kworkstation-common-deps: \
 	use/vmguest/complete use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
 	use/power/acpi \
 	use/luks \
-	use/net-eth/dhcp use/net-ssh use/net/nm/nodelay \
+	use/net-eth/dhcp use/net-ssh use/net/nm/nodelay use/net/etcnet \
 	use/ntp/chrony \
 	use/docs/full \
 	use/xdg-user-dirs \
@@ -26,10 +26,12 @@ mixin/kworkstation-common-deps: \
 	use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
-	+net-eth +wireless +pulse +plymouth +systemd-optimal +wireless +vmguest +efi +nm \
+	use/alternatives/xvt/konsole \
+	+wireless +pulse +plymouth +systemd-optimal +wireless +vmguest +efi +nm \
 	use/stage2/kms/nvidia
 
 mixin/kworkstation-common-opts:
+	@$(call set,LOCALES,ru_RU be_BY en_US)
 	@$(call set,BRANDING,xalt-kworkstation)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
@@ -52,9 +54,6 @@ endif
 	@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-noto-serif)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-mono)
-	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
-	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
-	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
 	@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-symbols)
@@ -120,7 +119,7 @@ mixin/kworkstation-install-opts:
 	@$(call add,THE_PACKAGES,installer-feature-nfs-client-stage3)
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-kde-stage2)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-automount-stage2)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-weak-passwd)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-disable-remote-stage2)
@@ -132,7 +131,7 @@ mixin/kworkstation-install-opts:
 	@$(call add,INSTALL2_PACKAGES,installer-feature-set-tz)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-rootgtktheme-stage2)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-alterator-setup-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-sddm-setup)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-lightdm-kde)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-packagekit-setup)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-xprofile-clear)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-systemd-oomd)

conf.d/mixin.mk

@@ -94,16 +94,15 @@ mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
 mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
 	@$(call add,THE_PACKAGES,xcalib templates)
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
-	@$(call add,THE_PACKAGES,qt5-wayland)
-ifeq (sisyphus,$(BRANCH))
-	@$(call add,THE_PACKAGES,gnome-packagekit)
-endif
+	@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
+	@$(call add,THE_PACKAGES,packagekit)
 
 mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
 	use/x11/kde5-display-manager-lightdm \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
 	+pulse
 	@$(call add,THE_PACKAGES,kde5-telepathy)
+	@$(call add,THE_PACKAGES,qt6-wayland)
 ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,THE_PACKAGES,falkon-kde5)
 endif

conf.d/regular.mk

@@ -101,6 +101,8 @@ ifeq (sisyphus,$(BRANCH))
 endif
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+	@$(call add,BASE_PACKAGES,btrfs-progs)
 ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,CLEANUP_PACKAGES,acpid-events-power)
 else
@@ -191,9 +193,9 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 \
-	use/kernel/latest +plymouth
+	use/kernel/latest +plymouth use/browser/epiphany
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
-	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
+	@$(call add,LIVE_PACKAGES,screenpen)
 
 distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
 	@$(call add,THE_LISTS,$(call tags,lxqt desktop))

doc/params.txt

@@ -122,6 +122,7 @@ $HOME/.mkimage/profiles.mk.
 
 * REPORT
 ** запрашивает создание отчётов о собранном образе
+** требует включения DEBUG и отключения CHECK
 ** значение:
 ** пусто (по умолчанию) - создание отчёта выключено
 ** 2 - создать архив из каталога отчёта

features.in/efi/config.mk

@@ -34,7 +34,7 @@ use/efi/signed: use/efi
 	@$(call add,COMMON_PACKAGES,shim-signed)
 	@$(call add,COMMON_PACKAGES,mokutil pesign)
 	@$(call add,RESCUE_PACKAGES,openssl)
-ifeq (p10,$(BRANCH))
+ifeq (,$(filter-out p10 c10f1,$(BRANCH)))
 	@$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools)
 endif
 

features.in/grub/cfg.in/25install-vnc-connect.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
   savedefault
+  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/25install-vnc-listen.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
+  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }
 

features.in/grub/cfg.in/26live-install-vnc-connect.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
   savedefault
+  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }

features.in/grub/cfg.in/26live-install-vnc-listen.cfg

 
 menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
   savedefault
+  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ showopts nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
 }
 

features.in/grub/cfg.in/84rescue_remote.cfg

 menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
   savedefault
+  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
   linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
   echo $"Loading initial ramdisk ..."
   initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@

features.in/grub/cfg.in/90hdt_bios.cfg

 if [ "$grub_platform" = "pc" ]; then
   menuentry $"Hardware Info" --id 'hdt' {
+    echo $"Loading Memory Disk ..."
     linux16 /boot/memdisk
+    echo $"Loading hdt.img ..."
     initrd16 /boot/hdt.img
   }
 fi

features.in/grub/cfg.in/90memtest_bios.cfg

 if [ "$grub_platform" = "pc" ]; then
   menuentry $"Memory Test" --id 'memtest' {
+    echo $"Loading memtest.bin ..."
     linux16 /boot/memtest.bin
   }
 fi

features.in/plymouth/config.mk

@@ -20,7 +20,7 @@ use/plymouth/stage2: use/plymouth use/branding \
 	@$(call add,STAGE1_PACKAGES,make-initrd-plymouth)
 	@$(call add,STAGE1_BRANDING,bootsplash graphics)
 	@$(call add,STAGE2_BRANDING,bootsplash graphics)
-	@$(call add,STAGE2_BOOTARGS,quiet splash)
+	@$(call add,STAGE2_BOOTARGS,quiet loglevel=3 splash)
 else
 use/plymouth/stage2: use/plymouth use/branding; @:
 endif
@@ -32,8 +32,7 @@ endif
 	@$(call add,THE_BRANDING,bootsplash graphics)
 	@$(call add,THE_PACKAGES,make-initrd-plymouth cpio)
 ifeq (vm,$(IMAGE_CLASS))
-	@$(call add,VM_INITRDFEATURES,plymouth)
-	@$(call add,BASE_BOOTARGS,quiet splash)
+	@$(call add,BASE_BOOTARGS,quiet loglevel=3 splash)
 endif
 
 use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

features.in/plymouth/rootfs/image-scripts.d/10-plymouth

@@ -6,5 +6,10 @@ if [ -f "$CONFIG" ]; then
 	grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
 fi
 
+CONFIG="$destdir/etc/initrd.mk"
+if [ -f "$CONFIG" ]; then
+	grep -q plymouth "$CONFIG" || echo 'FEATURES += plymouth' >> "$CONFIG"
+fi
+
 cp -a /usr/share/plymouth/default-install-duration \
 	/var/lib/plymouth/boot-duration ||:

features.in/stage2/stage1/scripts.d/96-copy-cpe

+#!/bin/sh -ef
+
+cd /.image
+mkdir -p .disk
+
+. /etc/os-release
+
+[ -n "${CPE_NAME:-}" ] || exit 1
+
+echo "${CPE_NAME:-}" > .disk/cpe

features.in/x11/config.mk

@@ -191,7 +191,7 @@ use/x11/leechcraft: use/x11
 	@$(call add,THE_PACKAGES,leechcraft)
 
 use/x11/kde5: use/x11/xorg use/x11/kde/synaptic
-	@$(call add,THE_PACKAGES,kde5-big)
+	@$(call add,THE_PACKAGES,kde5)
 
 ## screensavers
 use/x11/xscreensaver:

lib/report.mk

 # enable make target tracing
 
+ifeq (,$(CHECK))
+ifneq (,$(DEBUG))
 ifneq (,$(REPORT))
 TRACE_PREFIX := trace:building
 OLD_SHELL := $(SHELL)
@@ -7,3 +9,5 @@ SHELL = $(info $(TRACE_PREFIX) $@$(if $^$|, -> $^ $|))$(OLD_SHELL)
 # piggyback BUILDDIR back into supervising environment
 $(info $(TRACE_PREFIX) BUILDDIR = $(BUILDDIR))
 endif
+endif
+endif

pkg.in/lists/education/live-lite

+printer-drivers-base
+ghostscript-cups
+samba-client-cups
+printer-drivers-X11
+cups-filters
+bluez-cups
+hplip
+epson-inkjet-printer-escpr
+printer-driver-brlaser
+printer-driver-capt
+printer-driver-foo2capt
+printer-driver-foo2kyo
+printer-driver-lbp660
+printer-driver-lxx74
+printer-driver-magicolor2430dl
+printer-driver-magicolor2530dl
+printer-driver-magicolor5430dl
+printer-driver-magicolor5440dl
+printer-driver-oki
+printer-driver-ptouch
+printer-driver-rname
+printer-driver-splix
+printer-driver-Xerox-Phaser-3200MFP
+
+system-config-printer
+system-config-printer-udev
+
+hplip-plugin
+epson-inkjet-printer-escpr2
+pantum
+
+simple-scan
+sane-airscan
+
+vlc-maxi
+
+#task-ecp-cryptopro

pkg.in/lists/kworkstation/disk-install

@@ -67,7 +67,6 @@ vsftpd
 anonftp
 vlock
 telnet
-kde5-display-manager-lightdm
 glibc
 alterator-dhcp
 alterator-mirror

pkg.in/lists/kworkstation/kde5

@@ -6,6 +6,7 @@ gdb
 fuse-cryfs
 libnss-mdns
 nvidia-modprobe
+nvidia-smi
 plasma5-libkscreen-utils
 
 libnvidia-encode
@@ -15,6 +16,7 @@ libnvcuvid
 ocl-nvidia
 ocl-icd@X32
 clinfo
+nvidia-vaapi-driver
 
 alt-csp-cryptopro
 rosa-crypto-tool
@@ -89,6 +91,8 @@ kde5-ktorrent
 #eiskaltdcpp-qt
 #kde5-kio-gdrive
 
+plasma5-welcome
 plasma5-desktop-maxi
+plasma5-kinfocenter-maxi
 kde5@META
 kde5-big@META

pkg.in/lists/kworkstation/kde5-base

@@ -19,6 +19,7 @@ alterator-datetime
 state-change-notify-postfix
 alterator-fbi
 alterator-groups
+alterator-grub
 alterator-limits
 alterator-logs
 alterator-multiseat
@@ -34,7 +35,6 @@ alterator-services
 alterator-sysconfig
 alterator-update-kernel
 alterator-users
-alterator-x11
 alterator-xkb
 alterator-zram-swap
 
@@ -55,12 +55,11 @@ bc
 bind-utils
 cpufreq-simple
 cifs-utils
+color-prompt-and-man
 curl
 ddcprobe@X86
 dmidecode
 easy-rsa
-eepm
-eepm-yum
 etcnet-full
 fdisk
 glxinfo
@@ -109,7 +108,7 @@ udev-rules-ioschedulers
 update-kernel
 usb-modeswitch
 usbutils
-#userpasswd
+userpasswd
 vdpauinfo
 vim-console
 vkd3d-utils
@@ -134,7 +133,7 @@ ca-certificates-digital.gov.ru
 chromium-gost
 
 openvpn-gostcrypto
-kde5-display-manager-sddm
+kde5-display-manager-lightdm
 kde5-network-manager-etcnet
 openssh openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
 systemd-ssh-agent

pkg.in/lists/tagged/base+regular

@@ -30,6 +30,7 @@ dmidecode@aarch64
 apt-repo
 apt-rsync
 apt-scripts
+apt-https
 #aptitude # See ALT bug 41622
 update-kernel
 eepm

pkg.in/lists/tagged/desktop+regular

@@ -78,3 +78,5 @@ htop
 #fwupd@x86_64
 
 blacklist-pcspkr@X86
+
+edid-decode

pkg.in/lists/tagged/security+extra

@@ -14,4 +14,4 @@ osec-cronjob
 osec-mailreport
 
 # hardware reliability
-mcelog@X86
+rasdaemon@!riscv64

pkg.in/lists/xfce-sysv

@@ -26,4 +26,6 @@ vlock
 wget
 whdd
 firmware-alsa-sof
-
+edid-decode
+mediainfo
+mpv

reports.mk

@@ -14,12 +14,6 @@ LOGDIR := $(shell sed -n 's/^LOGDIR = \(.*\)/\1/p' $(BUILDLOG))
 ifeq (,$(LOGDIR))
 LOGDIR := $(shell sed -n 's/^LOGDIR ?= \(.*\)/\1/p' $(BUILDCFG))
 endif
-ifeq (,$(IMAGE_OUTPATH))
-TARGET_NAME := $(shell sed -n 's/^IMAGE_NAME = \(.*\)/\1/p' $(BUILDDIR)/distcfg.mk)
-TARGET_TYPE := $(shell sed -n 's/^IMAGE_TYPE = \(.*\)/\1/p' $(BUILDDIR)/distcfg.mk)
-TARGET_NAME := $(TARGET_NAME).$(TARGET_TYPE)
-LOGDIR := $(LOGDIR)/CHECK
-endif
 
 # for a multi-image build there's no sense to refer to buildroot
 # contained reports as these are very ephemeral between builds
@@ -36,7 +30,6 @@ define report_body
 fi; }
 endef
 
-ifneq (,$(IMAGE_OUTPATH))
 all: reports/targets reports/scripts reports/cleanlog \
 	reports/contents reports/packages
 	@rm -fr "$(LOGDIR)/$(IMAGE_OUTFILE).reports"
@@ -45,24 +38,11 @@ all: reports/targets reports/scripts reports/cleanlog \
 	@mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.cfg
 	@find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \
 		"$(LOGDIR)/$(IMAGE_OUTFILE).reports/pkg.list"
+	@chmod +r -R "$(LOGDIR)/$(IMAGE_OUTFILE).reports"
 ifeq (2,$(REPORT))
 	@cd "$(LOGDIR)" && tar -cf "$(IMAGE_OUTFILE).reports.tar" "$(IMAGE_OUTFILE).reports" && \
 		rm -r "$(IMAGE_OUTFILE).reports"
 endif
-else
-all: reports/prep reports/targets reports/scripts
-	@rm -fr "$(LOGDIR)/$(TARGET_NAME).reports"
-	@cp -a "$(REPORTDIR)" "$(LOGDIR)/$(TARGET_NAME).reports"
-	@if [ -f "$(BUILDCFG)" ]; then \
-		cp -a "$(BUILDCFG)" "$(LOGDIR)/$(TARGET_NAME).reports/build.cfg"; \
-	fi
-	@find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \
-		"$(LOGDIR)/$(TARGET_NAME).reports/pkg.list"
-ifeq (2,$(REPORT))
-	@cd "$(LOGDIR)" && tar -cf "$(TARGET_NAME).reports.tar" "$(TARGET_NAME).reports" && \
-		rm -r "$(TARGET_NAME).reports"
-endif
-endif
 
 reports/prep:
 	@mkdir -p "$(REPORTDIR)" "$(LOGDIR)"