gear-store-tags

- starterkits-20190312

.gear/mkimage-profiles.spec

@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 1.2.21
+Version: 1.2.25
-Release: alt1
+Release: alt0.M80P.1
 
 Summary: ALT based distribution metaprofile
 License: GPLv2+
@@ -128,6 +128,18 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* Mon Mar 11 2019 Michael Shigorin <mike@altlinux.org> 1.2.25-alt0.M80P.1
+- starterkits-20190312
+
+* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.2.24-alt0.M80P.1
+- 20190305 beta (antohami@)
+
+* Fri Dec 07 2018 Michael Shigorin <mike@altlinux.org> 1.2.23-alt0.M80P.1
+- starterkits-20181212
+
+* Thu Sep 20 2018 Michael Shigorin <mike@altlinux.org> 1.2.22-alt0.M80P.1
+- starterkits-20180912
+
 * Mon Aug 13 2018 Michael Shigorin <mike@altlinux.org> 1.2.21-alt1
 - volumes feature; fixups
 

.gear/tags/5e9b46a73879507640d3173c87520dca2819dc84

@@ -0,0 +1,6 @@
+object fcbef92bf0a2e32aea60fb12a96fe7e35d0abcaf
+type commit
+tag v1.2.25
+tagger Michael Shigorin <mike@altlinux.org> 1552306874 +0300
+
+20190312

.gear/tags/c59a92ded00cc09186d7cdf258fe5d86d019ba94

@@ -1,6 +0,0 @@
-object e3043208f677dc7a9213ee9d194ecb177f632aef
-type commit
-tag v1.2.21
-tagger Michael Shigorin <mike@altlinux.org> 1534180062 +0300
-
-volumes

.gear/tags/list

@@ -1 +1 @@
-c59a92ded00cc09186d7cdf258fe5d86d019ba94 v1.2.21
+5e9b46a73879507640d3173c87520dca2819dc84 v1.2.25

bin/tar2fs

@@ -52,6 +52,10 @@ e2k)
 	BOOTPART="1"
 	ROOTPART="2"
 	;;
+mips*)
+	ROOTPART="1"
+	BLOCKDEV="/dev/sda"
+	;;
 esac
 
 # figure out the part taken by /boot in the given tarball
@@ -213,6 +217,16 @@ if [ -n "$BOOTPART" ]; then
 	echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
 fi
 
+# Query ARCH in chroot and redefine arch-dependent variable
+ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
+
+if [[ $ARCH = *86* ]]
+	then 	# NB: different storage modules might be needed for non-kvm
+		INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
+else
+	INITRD_MODULES=
+fi
+
 echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
 
 case "$ARCH" in
@@ -290,8 +304,17 @@ image=/boot/vmlinuz
 	boot=$BLOCKDEV
 	$LILO_COMMON
 	EOF
+elif [ -x "$ROOTFS"/usr/sbin/grub-efi-autoupdate ]; then
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	chroot "$ROOTFS" grub-install
+elif [ -x "$ROOTFS"/usr/sbin/grub-autoupdate ]; then
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
 fi
 
 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
+	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" ||:
 fi
+# maybe qemu interpreter was copied to chroot;
+# this is no longer necessary, remove
+rm -rf "$ROOTFS"/.host ||:

conf.d/live.mk

@@ -1,7 +1,7 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/dos: distro/.init use/dos use/syslinux/ui/menu
+distro/dos: distro/.boot use/dos use/syslinux/ui/menu
 	@$(call set,RELNAME,ALT FreeDOS)
 
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
@@ -12,7 +12,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
 	@$(call set,SYSLINUX_DIRECT,1)
 	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
 
-distro/syslinux: distro/.init \
+distro/syslinux: distro/.boot \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:

conf.d/mixin.mk

@@ -66,9 +66,9 @@ mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
 	use/fonts/otf/adobe use/fonts/otf/mozilla
 	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
 	@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
+	@$(call add,THE_PACKAGES,xscreensaver)
 
-mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im \
+mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
-	use/browser/palemoon/i18n +nm
 	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
 	@$(call add,THE_PACKAGES,qasmixer qpdfview)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

conf.d/regular.mk

@@ -36,7 +36,7 @@ distro/.regular-desktop: distro/.regular-wm \
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)
 
-distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
 distro/.regular-sysv: distro/.regular-wm +sysvinit \
 	use/init/sysv/consolekit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
@@ -100,13 +100,14 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
 	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
 	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
+	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
+	use/init/sysv/consolekit
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
 
 distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
-	use/x11/lightdm/slick use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
 	use/browser/chromium use/fonts/ttf/redhat use/efi/refind
 	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))

conf.d/vm.mk

@@ -2,10 +2,10 @@
 ifeq (vm,$(IMAGE_CLASS))
 
 # NB: interactivesystem pulls in network-config-subsystem anyways
-vm/bare: vm/.bare +sysvinit
+vm/bare: vm/.base-lilo +sysvinit
 	@$(call add,BASE_PACKAGES,apt)
 
-vm/systemd: vm/.bare +systemd
+vm/systemd: vm/.base-grub +systemd
 	@$(call add,BASE_PACKAGES,apt)
 
 # handle ROOTPW (through deflogin)

features.in/build-vm/lib/90-build-vm.mk

@@ -23,11 +23,15 @@ check-sudo:
 	fi
 
 prepare-image: check-sudo
-	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
+	@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot
-		TOPDIR=$(MKIMAGE_PREFIX); \
+	@#if qemu is used
+	@(cd "$(BUILDDIR)/.work/chroot/"; \
+		tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:; \
+	if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
 	fi; \
-	if ! sudo $(TOPDIR)/bin/tar2fs \
+	if ! sudo $$TOPDIR/bin/tar2fs \
-		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi

features.in/fonts/config.mk

@@ -51,3 +51,9 @@ use/fonts/ttf/redhat:
 
 use/fonts/ttf/ubuntu:
 	@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)
+
+use/fonts/ttf/xo:
+	@$(call add,THE_PACKAGES,fonts-ttf-XO)
+	@$(call add,THE_PACKAGES,fonts-ttf-PT)
+	@$(call add,THE_PACKAGES,fonts-ttf-Cormorant)
+	@$(call add,THE_PACKAGES,fonts-ttf-open-sans)

features.in/init/config.mk

@@ -17,7 +17,7 @@ use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)
 
 use/init/sysv/consolekit: use/init/sysv
-	@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
+	@$(call add,THE_PACKAGES,ConsoleKit2-service ConsoleKit2-x11)
 
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init

features.in/init/rootfs/image-scripts.d/90-systemd

@@ -15,11 +15,7 @@ sub() {
 }
 
 # tune make-initrd
-sub /etc/initrd.mk 'FEATURES += systemd' 'MODULES_PRELOAD += autofs4'
+sub /etc/initrd.mk 'MODULES_PRELOAD += autofs4'
 
 # don't allow systemd to set LANG (see also #27408)
 sub /etc/locale.conf 'LANG='
-
-# aufs2 root is rw in reality; but don't bother if there's a record already
-grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
-	sub /etc/fstab '/dev/root / auto defaults 0 0'

features.in/init/stage2/image-scripts.d/91-systemd

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# the part below relates to systemd as init specifically
+rpm -q systemd-sysvinit || exit 0
+
+sub() {
+	local file="$1"
+	shift
+	for i in "$@"; do
+		grep -q "^$i" "$file" || echo "$i" >> "$file"
+	done
+}
+
+# aufs2 root is rw in reality; but don't bother if there's a record already
+grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
+	sub /etc/fstab '/dev/root / auto defaults 0 0'

features.in/wireless/config.mk

@@ -2,7 +2,7 @@
 
 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 rtl8723de staging)
 	@$(call add,THE_LISTS,tools/wireless)
 
 use/wireless/full: use/wireless use/kernel/wireless; @:

features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin

@@ -79,6 +79,20 @@ if [ -f "$GDM_CONF" ]; then
 	restore_later "/etc/group"
 fi
 
+
+## lxdm autologin
+LXDM_CONF=/etc/lxdm/lxdm.conf
+if [ -f "$LXDM_CONF" ]; then
+	backup "$LXDM_CONF"
+	sed -i -e "s/\# autologin=dgod/autologin=$USER/" \
+		"$LXDM_CONF"
+	backup "/etc/group"
+	add_nopasswdlogin_group lxdm ||:
+
+	restore_later "$LXDM_CONF"
+	restore_later "/etc/group"
+fi
+
 autologin_kdm() {
 	backup "$1"
 	sed -i \

features.in/x11/config.mk

@@ -93,6 +93,9 @@ use/x11/gdm2.20: use/x11-autostart
 use/x11/sddm: use/x11-autostart
 	@$(call add,THE_PACKAGES,sddm)
 
+use/x11/lxdm: use/x11-autostart
+	@$(call add,THE_PACKAGES,lxde-lxdm)
+
 use/x11/icewm: use/x11
 	@$(call add,THE_LISTS,$(call tags,icewm desktop))
 

lib/build.mk

@@ -21,13 +21,23 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"
 
+
+# e2k* builds always run natively, and without setarch
+ifeq (,$(findstring e2k,$(ARCH)))
+
 # /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
 # armh (armv7l) doesn't have any but should cope with qemu-arm.static;
 # also check whether non-x86 build is running native
-EARCH := $(patsubst e2k%,e2k,$(subst armh,arm,$(ARCH)))
-ifeq (,$(findstring e2k,$(EARCH)))
 ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
-ifeq (,$(findstring $(EARCH),$(shell uname -m)))
+
+EARCH := $(subst armh,arm,$(ARCH))
+
+# for mips*el, `uname -m` never has 'el' suffix, but
+# qemu-user-static binaries always do.
+UARCH := $(subst mipsel,mips,$(EARCH))
+UARCH := $(subst mips64el,mips64,$(UARCH))
+
+ifeq (,$(findstring $(UARCH),$(shell uname -m)))
 export GLOBAL_HSH_USE_QEMU=$(EARCH)
 endif
 else
@@ -35,6 +45,7 @@ START += $(ARCH)
 endif
 endif
 
+
 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \
 	if [ -d "$$HOME/out" -a -w "$$HOME/out" ]; then \

lib/vm.mk

@@ -8,8 +8,20 @@ ifeq (vm,$(IMAGE_CLASS))
 
 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))	# useless on anything else
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vm/.base-lilo: vm/.bare
 	@$(call add,BASE_PACKAGES,lilo)
 endif
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vm/.base-grub: vm/.bare
+	@$(call add,BASE_PACKAGES,grub2-pc)
+endif
+
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+vm/.base-grub-efi: vm/.bare
+	@$(call add,BASE_PACKAGES,grub2-efi)
+endif
+
 endif

pkg.in/lists/remote-access

@@ -0,0 +1,5 @@
+connector
+freerdp
+remmina
+remmina-plugins
+x2goclient

pkg.in/lists/sound/pulseaudio

@@ -1,6 +1,3 @@
 pulseaudio-daemon
-
 pulseaudio-utils
-pavucontrol
-
 alsa-plugins-pulse

pkg.in/lists/tagged/base+desktop+live

@@ -1,4 +1,5 @@
 wget
+curl
 rsync
 apt
 fdisk

pkg.in/lists/tagged/builder+extra

@@ -4,6 +4,7 @@ fdisk
 gear
 hasher
 iproute2
+isomd5sum
 mkimage-profiles
 net-tools
 parallel

pkg.in/lists/tagged/desktop+engineering

@@ -8,6 +8,7 @@ librecad
 qcad
 qcad-partlibrary
 solvespace
+qelectrotech
 
 # 3D CAD
 freecad

pkg.in/lists/tagged/desktop+mate

@@ -2,7 +2,7 @@ mate-default
 # this might be a tad too much anyways
 mate-maxi@X86
 
-altlinux-freedesktop-menu-mate
+#altlinux-freedesktop-menu-mate
 
 ### should be dropped at some stage; see bugreports within this thread:
 # http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
@@ -10,3 +10,6 @@ iso-codes
 tzdata
 
 pavucontrol
+
+# clipboard manager
+parcellite

pkg.in/lists/tagged/desktop+regular

@@ -33,6 +33,7 @@ cpu-x@X86
 fuse-exfat
 hdparm
 inxi@X86
+lcdtest
 lm_sensors3
 lsblk
 sdparm
@@ -40,6 +41,7 @@ sdparm
 fonts-bitmap-terminus
 
 ldd-requires@X86
+arm-rootfs-installer
 
 gparted@X86
 gpart

pkg.in/lists/tagged/mobile+mate

@@ -12,4 +12,4 @@ notification-daemon
 acpi
 acpid
 #acpid-events-power
-eeepc-acpi-scripts
+eeepc-acpi-scripts@X86

pkg.in/lists/tagged/rescue+extra

@@ -150,6 +150,7 @@ fuse-7z
 adcfw-log
 arpwatch
 cifs-utils
+curl
 davfs2
 dhcpdump
 dsniff
@@ -243,3 +244,6 @@ usbmuxd
 
 # l10n
 glibc-locales
+
+# Misc
+rescue-launcher

pkg.in/lists/tagged/rescue+x11

@@ -1,18 +1,17 @@
 # mostly X11 counterparts/GUIs to some rescue+extra packages
 autopsy
 binwalk
-dissy
+dissy@X86
-dsniff-X11
+dsniff-X11@X86
 dvdisaster
 extract
 gksu
 gparted
 gsmartcontrol
 jhead
-hardinfo
+hardinfo@X86
 ht
 libpst-tools
-ntop
+qt-fsarchiver@X86
-qt4-fsarchiver
+recoll-full@X86
-recoll-full
 recoverjpeg

sub.in/rootfs/image-scripts.d/90-firsttime

@@ -1,3 +1,3 @@
 #!/bin/sh
 # Run scripts from /etc/firsttime.d at first start
-[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"
+[ -f "/etc/firsttime.flag" ] || touch "/etc/firsttime.flag"