1.1.7-alt1

- minor fixes
clean.mk: allow to forbid cleanup explicitly
2013-08-26 17:06:41 +03:00 · 2013-08-13 22:32:27 +04:00 · 2013-08-13 22:23:11 +04:00 · 2013-08-13 22:23:11 +04:00 · 2013-08-13 13:35:56 +04:00 · 2013-08-13 13:30:33 +04:00
45 changed files with 162 additions and 117 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.1.2
+Version: 1.1.7
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,21 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Aug 26 2013 Michael Shigorin <mike@altlinux.org> 1.1.7-alt1
+- minor fixes
+
+* Mon Aug 12 2013 Michael Shigorin <mike@altlinux.org> 1.1.6-alt1
+- vm-net retired
+
+* Mon Aug 05 2013 Michael Shigorin <mike@altlinux.org> 1.1.5-alt1
+- armh related fixes
+
+* Mon Jul 29 2013 Michael Shigorin <mike@altlinux.org> 1.1.4-alt1
+- assorted fixups
+
+* Mon Jul 22 2013 Michael Shigorin <mike@altlinux.org> 1.1.3-alt1
+- armh fixes and tweaks
+
 * Mon Jul 15 2013 Michael Shigorin <mike@altlinux.org> 1.1.2-alt1
 - control and sound features

--- a/.gear/tags/7fdf29e5091fc74d5cc493683c08ab6f5ca7cead
+++ b/.gear/tags/7fdf29e5091fc74d5cc493683c08ab6f5ca7cead
@@ -0,0 +1,6 @@
+object 8b26752de99ccc00a7df82f09356c56941e8366d
+type commit
+tag v1.1.6
+tagger Michael Shigorin <mike@altlinux.org> 1376329985 +0400
+
+vm-net retired
--- a/.gear/tags/f48e25ec93bdc02ceda53058eb16780369a41738
+++ b/.gear/tags/f48e25ec93bdc02ceda53058eb16780369a41738
@@ -1,6 +0,0 @@
-object 40468c8395516cf29c7c6f16b56d46bbb23c3f9f
-type commit
-tag v1.1.1
-tagger Michael Shigorin <mike@altlinux.org> 1372711661 +0000
-
-cuboxism
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-f48e25ec93bdc02ceda53058eb16780369a41738 v1.1.1
+7fdf29e5091fc74d5cc493683c08ab6f5ca7cead v1.1.6
--- a/13
+++ b/13
@@ -6,15 +6,16 @@
 -include $(HOME)/.mkimage/profiles.mk

 # for immediate assignment
-ifndef ARCHES
-ifdef ARCH
-ARCHES := $(ARCH)
-else
-ARCHES := $(shell arch \
+ifndef ARCH
+ARCH := $(shell arch \
 	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
+
+ifndef ARCHES
+ARCHES := $(ARCH)
 endif
-export ARCHES
+
+export ARCHES ARCH

 export PATH := $(CURDIR)/bin:$(PATH)

--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -157,14 +157,9 @@ fi
 # not ROOTSIZEM but "the rest"; somewhat non-trivial arithmetics lurk in parted
 mkpart

-kpartx -a "$LOOPDEV"
+kpartx -a -s "$LOOPDEV"
 LOOPROOT="/dev/mapper/$(basename "$LOOPDEV")p$ROOTPART"

-# might take a tiny bit of time to actually appear
-for i in `seq 10`; do
-	[ -b "$LOOPROOT" ] && break || sleep 0.1
-done
-
 mkfs."$ROOTFSTYPE" "$LOOPROOT"

 if [ -n "$BOOTPART" ]; then
--- a/conf.d/armh.mk
+++ b/conf.d/armh.mk
@@ -2,6 +2,12 @@ ifeq (armh,$(ARCH))

 ifeq (ve,$(IMAGE_CLASS))

+# aliases for autobuild
+ve/regular-arm-e17: ve/arm-e17; @:
+ve/regular-arm-kde4: ve/arm-kde4; @:
+ve/altlinux-p7-nexus7-e17: ve/arm-e17; @:
+ve/altlinux-p7-nexus7-kde4: ve/arm-kde4; @:
+
 ve/.tegra3-base: ve/.base use/armh use/kernel
 	@$(call add,BASE_PACKAGES,nvidia-tegra)

@@ -29,19 +35,19 @@ endif
 ifeq (vm,$(IMAGE_CLASS))

 # NB: early dependency on use/kernel is on intent
-vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/vm-ssh; @:
+vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/net-ssh; @:
 	@$(call add,BASE_PACKAGES,interactivesystem e2fsprogs)
 	@$(call add,BASE_PACKAGES,apt)
 	@$(call add,BASE_PACKAGES,mkinitrd uboot-tools)
 	@$(call set,BRANDING,altlinux-kdesktop)

-vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \
-	use/cleanup/installer use/repo use/branding use/xdg-user-dirs/deep \
-	+pulse
-	@$(call set,KFLAVOURS,cubox)
+vm/.cubox-bare: vm/.arm-base use/armh-cubox use/net-ssh use/repo use/tty/S0
+	@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
+
+vm/.cubox-desktop: vm/.cubox-bare use/armh-dovefb +systemd +pulse \
+	use/armh-cubox use/branding use/xdg-user-dirs/deep
 	@$(call set,BRANDING,altlinux-kdesktop)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
-	@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
 	@$(call add,BASE_PACKAGES,parole gst-ffmpeg gst-plugins-vmeta)
 	@$(call add,BASE_PACKAGES,gst-plugins-good gst-plugins-nice)
 	@$(call add,BASE_PACKAGES,gst-plugins-bad gst-plugins-ugly)
@@ -50,16 +56,38 @@ vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \
 	@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
 	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))

-vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @:
-vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @:
-
-vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \
-	use/domain-client +nm; @:
-
-vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
+vm/cubox-xfce-ru: vm/.cubox-desktop use/deflogin/altlinuxroot \
+	use/slinux/arm use/x11/lightdm/gtk use/x11-autologin +nm
 	@$(call add,BASE_PACKAGES,livecd-ru)

+# these images use a kind of OEM setup
+vm/.cubox-oem: vm/.cubox-desktop use/oem; @:
+
+vm/.cubox-gtk: vm/.cubox-oem use/x11/lightdm/gtk +nm; @:
+
+vm/cubox-xfce: vm/.cubox-gtk \
+	use/slinux/arm use/net-usershares use/domain-client; @:
+
 vm/cubox-mate: vm/.cubox-gtk use/x11/mate; @:
+	@$(call set,BRANDING,altlinux-centaurus)
+	@$(call add,THE_BRANDING,mate-settings)
+
+vm/cubox-tde: vm/.cubox-oem use/net-eth/dhcp use/x11-autostart +tde
+	@$(call add,BASE_LISTS,openscada)
+
+vm/cubox-kde4: vm/.cubox-oem use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse
+	@$(call add,BASE_LISTS,$(call tags,desktop && kde4 && !extra))
+
+vm/cubox-server: vm/.cubox-bare use/deflogin/altlinuxroot use/control/sudo-su \
+	+sysvinit
+	@$(call set,BRANDING,altlinux-centaurus)
+	@$(call add,BASE_PACKAGES,agetty fdisk)
+	@$(call add,BASE_LISTS,$(call tags,base security))
+
+vm/arm-server: vm/.arm-base use/net-eth/dhcp use/cleanup/installer +sysvinit
+	@$(call set,KFLAVOURS,armadaxp)
+	@$(call add,BASE_PACKAGES,agetty)
+	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))

 endif

--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -49,8 +49,7 @@ distro/live-rescue: distro/live-icewm use/efi
 		$(call tags,(base || extra) && (archive || rescue || network)))

 # NB: this one doesn't include the browser, needs to be chosen downstream
-distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru \
-	use/sound/alsa
+distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -49,7 +49,8 @@ endif

 distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @:

-distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm; @:
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm
+	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))

 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
@@ -66,8 +67,9 @@ distro/regular-cinnamon: distro/.regular-gtk \

 distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:

-distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
+distro/regular-tde: distro/.regular-desktop use/net-eth/dhcp +tde +plymouth
 	@$(call add,LIVE_PACKAGES,kdegames kdeedu)
+	@$(call add,LIVE_LISTS,openscada)

 distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
 	use/fonts/zerg +pulse +plymouth
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -72,9 +72,8 @@ endif # IMAGE_CLASS: ve

 ifeq (vm,$(IMAGE_CLASS))

-vm/net-static: vm/bare use/vm-net/static use/vm-ssh
-	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
-	@$(call set,VM_NET_IPV4GW,10.0.2.2)
+vm/net-static: vm/bare use/net-eth use/net-ssh
+	@$(call add,NET_ETH,eth0:static:10.0.2.16/24:10.0.2.2)

 endif # IMAGE_CLASS: vm

--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -4,7 +4,7 @@ ifeq (vm,$(IMAGE_CLASS))
 vm/bare: vm/.bare
 	@$(call add,BASE_PACKAGES,apt)

-vm/net: vm/bare use/vm-net/dhcp use/vm-ssh
+vm/net: vm/bare use/net-eth/dhcp use/net-ssh
 	@$(call add,BASE_PACKAGES,su)

 # NB: use/x11 employs some installer-feature packages
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -47,7 +47,7 @@
 ** экономия RAM+swap при сборке в tmpfs, иначе места на диске
 ** очистка рабочего каталога после успешной сборки очередной стадии
 ** может помешать использовать некоторые варианты отладки
-** значение: любая строка; по умолчанию пусто при DEBUG, иначе 1
+** значение: пусто, 0, 1, 2; по умолчанию пусто при DEBUG, иначе 1
 ** см. ../lib/clean.mk

 * DEBUG
--- a/features.in/armh-cubox/config.mk
+++ b/features.in/armh-cubox/config.mk
@@ -1,2 +1,3 @@
-use/armh-cubox: use/armh-dovefb
+use/armh-cubox: use/armh
 	@$(call add_feature)
+	@$(call set,KFLAVOURS,cubox)
--- a/features.in/armh-dovefb/config.mk
+++ b/features.in/armh-dovefb/config.mk
@@ -1,3 +1,3 @@
-use/armh-dovefb:
+use/armh-dovefb: use/armh
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,xorg-drv-dovefb)
--- a/features.in/armh/rootfs/image-scripts.d/50-sshd-root
+++ b/features.in/armh/rootfs/image-scripts.d/50-sshd-root
@@ -1,8 +0,0 @@
-#!/bin/sh
-# poor man's root switch
-# NB: 50-users creates predefined users
-
-cat >> /etc/openssh/sshd_config << EOF
-PermitRootLogin yes
-UseDNS no
-EOF
--- a/features.in/control/config.mk
+++ b/features.in/control/config.mk
@@ -4,5 +4,5 @@ use/control:
 	@$(call xport,CONTROL)

 # some presets
-use/control/sudo-su:
+use/control/sudo-su: use/control
 	@$(call add,CONTROL,su:public sudo:public)
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -9,7 +9,6 @@ use/firmware:
 use/firmware/full: use/firmware/server use/firmware/laptop

 use/firmware/cpu: use/firmware
-	@$(call add,THE_PACKAGES,firmware-amd-ucode)
 	@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)

 use/firmware/server: use/firmware
--- a/features.in/homeros/config.mk
+++ b/features.in/homeros/config.mk
@@ -1,4 +1,4 @@
-use/homeros: use/control/sudo-su
+use/homeros: use/control/sudo-su use/services
 	@$(call add_feature)
 #	@$(call set,BRANDING,simply-linux)
 #	@$(call add,THE_BRANDING,menu xfce-settings)
@@ -8,3 +8,4 @@ use/homeros: use/control/sudo-su
 	@$(call add,THE_LISTS,homeros/yasr)
 	@$(call add,THE_LISTS,homeros/tools)
 #	@$(call set,META_VOL_SET,Homeros)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sshd voiceman)
--- a/features.in/homeros/live/image-scripts.d/10-ssh
+++ b/features.in/homeros/live/image-scripts.d/10-ssh
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-chkconfig sshd on
--- a/features.in/homeros/live/image-scripts.d/10-voiceman
+++ b/features.in/homeros/live/image-scripts.d/10-voiceman
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-chkconfig voiceman on
--- a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
+++ b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
@@ -38,7 +38,7 @@ write_iface() {
 		echo "BOOTPROTO=$proto"
 		echo "NM_CONTROLLED=$NMCTL"
 		echo "DISABLED=$NMCTL"
-		echo "USE_IFPLUGD=yes"
+		echo "#USE_IFPLUGD=yes"
 	} > "$dir/options"
 }

--- a/features.in/net-ssh/README
+++ b/features.in/net-ssh/README
@@ -0,0 +1,3 @@
+Эта фича предназначена для добавления в образ поддержки SSH:
+добавляется клиент и конфигурируется сервер (требуется задание
+пути к существующему публичному ключу посредством переменной SSH_KEY).
--- a/features.in/net-ssh/config.mk
+++ b/features.in/net-ssh/config.mk
@@ -0,0 +1,4 @@
+use/net-ssh: use/net use/services
+	@$(call add_feature)
+	@$(call add,THE_LISTS,openssh)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
--- a/features.in/net-ssh/generate.mk
+++ b/features.in/net-ssh/generate.mk
@@ -2,11 +2,12 @@ ifdef BUILDDIR

 include $(BUILDDIR)/distcfg.mk

-# prepare the provided public SSH key to be carried over into the VM image
+# prepare the provided public SSH key to be carried over into the image
 all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
 all:
 	@if [ -s "$(SSH_KEY)" ]; then \
-		install -pD "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
+		mkdir -pm0700 "$(SSH_DIR)"; \
+		install -pm0600 "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
 	fi

 endif
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -1,4 +1,4 @@
-+nm: use/net/nm; @:
+nm: use/net/nm/nodelay; @:

 use/net: use/services
 	@$(call add_feature)
@@ -12,6 +12,9 @@ use/net/nm: use/net
 	@$(call add,THE_LISTS,$(call tags,desktop nm))
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)

+use/net/nm/nodelay: use/net/nm
+	@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
+
 use/net/connman: use/net
 	@$(call add,THE_PACKAGES,connman)
 	@$(call add,DEFAULT_SERVICES_ENABLE,connman)
--- a/features.in/services/config.mk
+++ b/features.in/services/config.mk
@@ -4,9 +4,3 @@ use/services: sub/rootfs
 	@$(call xport,DEFAULT_SERVICES_DISABLE)
 	@$(call xport,SERVICES_ENABLE)
 	@$(call xport,SERVICES_DISABLE)
-
-# some presets
-
-use/services/ssh: use/services use/net
-	@$(call add,THE_LISTS,openssh)
-	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
--- a/features.in/sound/config.mk
+++ b/features.in/sound/config.mk
@@ -1,14 +1,10 @@
 +pulse: use/sound/pulse; @:

-# common ALSA based part
+# "bare" ALSA (which is good enough for many of us) with persistent levels
 use/sound:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,alsa)
-	@$(call add,THE_PACKAGES,amixer alsa-utils aplay)
-
-# "bare" ALSA (which is good enough for many of us) with persistent levels
-use/sound/alsa: use/sound
-	@$(call add,THE_PACKAGES,udev-alsa)
+	@$(call add,THE_PACKAGES,amixer alsa-utils aplay udev-alsa)

 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
--- a/features.in/tty/README
+++ b/features.in/tty/README
@@ -0,0 +1,5 @@
+Эта фича занимается терминалами ввода-вывода, в первую очередь
+COM-портами (serial console).
+
+Следует заметить, что systemd занимается развешиванием agetty
+самостоятельно.
--- a/features.in/tty/config.mk
+++ b/features.in/tty/config.mk
@@ -0,0 +1,9 @@
+use/tty:
+	@$(call add_feature)
+	@$(call xport,TTY_DEV)
+	@$(call xport,TTY_RATE)
+
+use/tty/S0: use/tty
+	@$(call add,THE_PACKAGES,agetty)
+	@$(call add,TTY_DEV,ttyS0)
+	@$(call set,TTY_RATE,115200)
--- a/features.in/tty/rootfs/image-scripts.d/50-serial
+++ b/features.in/tty/rootfs/image-scripts.d/50-serial
@@ -0,0 +1,18 @@
+#!/bin/sh
+# setup serial console access
+
+BIN=/sbin/agetty
+CFG=/etc/inittab
+SEC=/etc/securetty
+
+[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
+[ -s "$CFG" -a -x "$BIN" ] || exit 0
+
+if ! grep -q "$BIN" "$CFG"; then
+	n=0
+	for t in $GLOBAL_TTY_DEV; do
+		grep -q "$t" "$SEC" || echo "$t" >> "$SEC"
+		echo "T$n:345:respawn:$BIN -L $t $GLOBAL_TTY_RATE vt100" >> $CFG
+		n=$(($n+1))
+	done
+fi
--- a/features.in/vm-net/README
+++ b/features.in/vm-net/README
@@ -1 +0,0 @@
-Эта фича устарела, более общая называется net-eth.
--- a/features.in/vm-net/config.mk
+++ b/features.in/vm-net/config.mk
@@ -1,8 +0,0 @@
-use/vm-net:
-	@$(warning obsolete feature, please upgrade to use/net-eth)
-
-use/vm-net/dhcp: use/vm-net use/net-eth/dhcp
-
-# need to further add VM_NET_IPV4ADDR and VM_NET_IPV4GW
-use/vm-net/static: use/vm-net use/net-eth
-	@$(call add,NET_ETH,eth0:static:$(VM_NET_IPV4ADDR):$(VM_NET_IPV4GW))
--- a/features.in/vm-ssh/README
+++ b/features.in/vm-ssh/README
@@ -1,6 +0,0 @@
-Эта фича предназначена для добавления в образ виртуальной машины
-поддержки SSH: добавляется клиент и конфигурируется сервер
-(требуется задание пути к существующему публичному ключу
-посредством переменной SSH_KEY).
-
-Фактически требует один из вариантов use/vm-net для осмысленности.
--- a/features.in/vm-ssh/config.mk
+++ b/features.in/vm-ssh/config.mk
@@ -1,3 +0,0 @@
-use/vm-ssh:
-	@$(call add_feature)
-	@$(call add,THE_LISTS,openssh)
--- a/features.in/vm-ssh/image-scripts.d/50-.ssh-perms
+++ b/features.in/vm-ssh/image-scripts.d/50-.ssh-perms
@@ -1,5 +0,0 @@
-#!/bin/sh
-# tighten up permissions just in case
-
-[ ! -d /root/.ssh ] || chmod 700 /root/.ssh
-[ ! -f /root/.ssh/authorized_keys ] || chmod 600 /root/.ssh/authorized_keys
--- a/features.in/x11-autostart/rootfs/image-scripts.d/40-x11-autostart
+++ b/features.in/x11-autostart/rootfs/image-scripts.d/40-x11-autostart
@@ -13,6 +13,7 @@ if [ -f "$INITTAB" ]; then
 fi

 ## ...and systemd, if any
-rm -f /etc/systemd/system/default.target
+## NB: alterator-setup's backup file can present a nice catch if left around
+rm -f /etc/systemd/system/default.target{,.bak}

 :
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -10,10 +10,14 @@ use/x11:
 	@$(call add,THE_KMODULES,drm)	# required by recent nvidia.ko as well
 	@$(call add,THE_LISTS,$(call tags,base xorg))

-# free drivers for various hardware (might lack acceleration)
+# x86: free drivers for various hardware (might lack acceleration)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/x11/xorg: use/x11 use/x11/intel
 	@$(call add,THE_KMODULES,drm-radeon drm-nouveau)
 	@$(call add,THE_LISTS,$(call tags,desktop xorg))
+else
+use/x11/xorg: use/x11; @:
+endif

 # both free and excellent
 use/x11/intel: use/x11
--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -53,10 +53,14 @@ distclean: clean
 # than BUILDDIR variable is -- usually it's unneeded afterwards
 postclean: build-image
 	@{ \
-	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)$(REPORT)" ] && \
-	     [ "$(NUM_TARGETS)" -gt 1 \
+	if [ "$(CLEAN)" != 0 ] && \
+	   [ "0$(DEBUG)" -lt 2 ] && \
+	   [ -z "$(CHECK)" ] && \
+	   [ -z "$(REPORT)" ] && \
+	   [ "$(NUM_TARGETS)" -gt 1 \
 	       -o -n "$(__frontend)" \
-	       -o ! -L "$(SYMLINK)" ]; then \
+	       -o ! -L "$(SYMLINK)" ]; \
+	then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \
 			GLOBAL_BUILDDIR="$(BUILDDIR)" $(LOG) ||:; \
--- a/pkg.in/lists/http-server
+++ b/pkg.in/lists/http-server
@@ -19,7 +19,6 @@ php5-memcache
 php5-mhash
 php5-mysql
 php5-pgsql
-php5-rrdtool
 php5-suhosin
 php5-xmlrpc
 php5-xsl
--- a/pkg.in/lists/kvm-server
+++ b/pkg.in/lists/kvm-server
@@ -1,4 +1,3 @@
-kvm
-#qemu
+qemu-kvm
 libvirt
 mkve
--- a/pkg.in/lists/openscada
+++ b/pkg.in/lists/openscada
@@ -0,0 +1,2 @@
+openscada-Model.AGLKS
+openscada-Model.Boiler
--- a/pkg.in/lists/tagged/desktop+gvfs
+++ b/pkg.in/lists/tagged/desktop+gvfs
@@ -0,0 +1,4 @@
+gvfs
+gvfs-backends
+gvfs-utils
+fuse-gvfs
--- a/pkg.in/lists/tagged/desktop+kde4
+++ b/pkg.in/lists/tagged/desktop+kde4
@@ -9,6 +9,7 @@ kde4-kbluetooth
 kde4-kolourpaint
 kde4-okular
 kde4-i18n-ru
+kde4-i18n-uk
 kde4base-plasma-applets
 plasma-applet-showdesktop
 kde4multimedia-kmix
--- a/pkg.in/lists/tagged/desktop+lxde+extra
+++ b/pkg.in/lists/tagged/desktop+lxde+extra
@@ -10,17 +10,11 @@ deadbeef
 mtpaint
 parcellite

-# gqview has thumbnails support, gpicview doesn't
-gqview
+# gqview is long erm... stable, george@ suggested upgrading to geeqie
+geeqie

 # file-roller is recommended over xarchiver (gns@) and not that fatty yet
 file-roller

-# for pcmanfm2 (aen@)
-gvfs
-gvfs-backends
-gvfs-utils
-fuse-gvfs
-
 # openbox behaviour, virtual desktops, etc
 obconf
--- a/sub.in/stage2/image-scripts.d/99-cleanup-boot
+++ b/sub.in/stage2/image-scripts.d/99-cleanup-boot
@@ -1,7 +1,8 @@
 #!/bin/sh

 # don't cripple the image to be copied over
-[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install -o \
+  -x /usr/sbin/homeros-install -o -x /usr/sbin/luwrain-install ] && exit 0

 # no need for the kernel in live root otherwise: it's been booted already
 rm -f /boot/*
Author	SHA1	Message	Date
Michael Shigorin	15a0e6769e	1.1.7-alt1 - minor fixes	2013-08-26 17:06:41 +03:00
Michael Shigorin	674f7db26e	clean.mk: allow to forbid cleanup explicitly The behaviour that sort of settled didn't actually follow the principle of the least surprise when one really wanted to have BUILDDIR available for inspection; DEBUG=2 would be effective to achieve that but CLEAN=0 would not. Thanks led@ for spotting and reporting this.	2013-08-13 22:32:27 +04:00
Michael Shigorin	891f982e92	regular.mk: get gvfs back into lxde flavour aen@ has suggested that gvfs support be present in regular-lxde as pcmanfm2 can make use of it; let's factor it back in here.	2013-08-13 22:23:11 +04:00
Michael Shigorin	b05007943b	desktop+gvfs: factored out from lxde pkglists gvfs pulls gnome-online-accounts and dconf in; these add considerable bloat that well may be undesirable in a lightweight distro, just pull this into a separate pkglist.	2013-08-13 22:23:11 +04:00
Michael Shigorin	07cc320b99	armh: get rid of 50-sshd-root It was a temporary hack actually, and is better dropped long-term: things like predefined root accounts with remote access are evil and this hook was a half of that "solution". Use of oem feature to integrate first-boot setup is recommended to deal with this issue, at least when graphics are available.	2013-08-13 13:35:56 +04:00
Michael Shigorin	f0368c6327	x11: make use/x11/xorg arch-dependent There's no such thing as xorg-dr[vi]-intel on non-x86 AFAIK, and the rest of the videodrivers is only generic on x86 too.	2013-08-13 13:30:33 +04:00
Michael Shigorin	4cfe0fa10f	gear-store-tags	2013-08-12 21:59:10 +04:00
Michael Shigorin	8b26752de9	1.1.6-alt1 - vm-net retired	2013-08-12 21:49:00 +04:00
Michael Shigorin	f44c386107	firmware: drop firmware-amd-ucode It's merged into firmware-linux, thanks lakostis@ for the explanation; P:/O: should be added but less line noise is better anyways.	2013-08-12 20:53:02 +04:00
Michael Shigorin	af1dd0f4e3	armh.mk: tweak vm/arm-server too basesystem doesn't warrant an init these days apparently, let's make sure one does land here.	2013-08-12 20:53:02 +04:00
Michael Shigorin	1276284ce7	armh.mk: initial cubox-server This one was asked for and is pretty reasonable common base to play with cubox from scratch (being ALT); the intermediate targets had to be refactored with: - vm/.cubox-bare becoming that bare (it doesn't even warrant an init anymore, let alone xorg); - vm/.cubox-desktop accomodating most of desktop bits; - vm/.cubox-base becoming vm/.cubox-oem as it should be. The just-introduced tty feature is employed either.	2013-08-12 20:53:02 +04:00
Michael Shigorin	20f8c1853d	armh-{cubox,dovefb}: minor refactoring The initial suggestion that any cubox image is a desktop one didn't hold out for long; and xorg related bits are not that related to boot script setup in terms of neccessity.	2013-08-12 20:53:02 +04:00
Michael Shigorin	989c903efb	initial tty feature This one only cares for serial console(s) in sysvinit case now but might end up controlling the number of gettys for ve/vm, etc.	2013-08-12 20:53:02 +04:00
Michael Shigorin	de38413966	armh: update warning in 50-sshd-root It basically reads the same but was referring to a neighbour script that has been moved to a separate deflogin feature during heavy refactoring of initial implementation draft.	2013-08-12 20:53:01 +04:00
Michael Shigorin	43e76bd650	vm-net: feature retired This one was replaced by the net feature completely and has been declared obsolete since 1.1.1 (a month ago). A few remaining users trivially adjusted.	2013-08-12 20:53:01 +04:00
Michael Shigorin	de94641c41	vm-ssh: renamed to net-ssh and cleaned up There was no need to split carrying over the pubkey and tightening up permissions on the file and its parent directory to be done in two separate scripts; this should be more generic now as a bonus. Users adjusted accordingly.	2013-08-12 20:53:01 +04:00
Michael Shigorin	62a37f373f	control: fix sudo-su target use/control/sudo-su apparently lacked dependency on plain use/control thus defeating the whole affair; thanks msp@ for spotting and reporting this.	2013-08-12 20:53:01 +04:00
Michael Shigorin	9257927e86	homeros: replace chkconfig hooks with use/services Things that had to be done by hand are now generalized and made convenient, hopefully.	2013-08-12 20:53:01 +04:00
Michael Pozhidaev	99a7a97284	stage2: extend /boot cleaner stoplist Minor fix: /boot directory is not cleaned for livecd if there are homeros-install or luwrain-install files (in addition to live-install and livecd-install being already checked).	2013-08-12 20:53:01 +04:00
Michael Shigorin	49b400378d	gear-store-tags	2013-08-05 21:42:00 +04:00
Michael Shigorin	922b44bf57	1.1.5-alt1 - armh related fixes	2013-08-05 20:57:18 +04:00
Michael Shigorin	e43386c1fe	armh.mk: added aliases for nightly/arm The automated build relies on particular names to be buildable and this broke during some sync; http://nightly.altlinux.org/sisyphus-arm/snapshots/ were empty as autobuild was failing since 20130710. p7 aliases go in too.	2013-08-05 11:21:35 +00:00
Michael Shigorin	84ad4092dc	Makefile: fixed an interbug This inobvious buglet has been spotted shortly after 1.1.0 refactoring was roughly over; the problem is that armh-specific targets would get ignored without explicit ARCH=armh. It's commit `768df7e9e9` which streamlined introspection within main.mk and a bug in Makefile which left ARCH empty even upon having autodetected it for ARCHES. The current version is more straightforward as a bonus.	2013-08-05 11:21:35 +00:00
Michael Shigorin	fbe571e296	armh.mk: forward-ported vm/arm-server Thanks glebfm@ for nudging me to do this; initial draft was the very firsh armh distro target successfully built and tested but the effort has refocused onto nexus7 ones with cubox images joining the party a bit later. Now it's the time for all good servers...	2013-08-05 11:19:49 +00:00
Michael Shigorin	5ef8291755	armh.mk: fix the silly comment It was sitting next to the wrong line after refactoring of cubox related target and was referring to "king" instead of "kind", very kind of me but not so kingly.	2013-08-05 13:53:26 +04:00
Michael Shigorin	9dc9f14f21	desktop+lxde+extra: s/gqview/geeqie/ george@ spotted gqview in regular-lxde.iso and wondered why; it's not being developed since 2006 or so while there's a fork named geeqie which has continued to improve upon it.	2013-08-01 13:48:42 +04:00
Michael Shigorin	873737a24e	net: avoid NM showstopper at boot by default Intro: NetworkManager-wait-online.service would, well, wait for some network interface to become online or for timeout to kick in. Problem: if a LiveCD is tested in offline environment that timeout will only impede the boot. Proposed solution: use/net/nm/nodelay target has been implemented to disable that service as proposed by sem@ and done in Simply; "+nm" target changed to be an alias to this one.	2013-07-30 09:58:22 +04:00
Michael Shigorin	6470e1d8da	gear-store-tags	2013-07-29 21:38:51 +04:00
Michael Shigorin	a7146f993a	1.1.4-alt1 - assorted fixups	2013-07-29 21:20:42 +04:00
Michael Shigorin	25616fb388	kvm-server: update for qemu/kvm merge kvm fork is no more, and qemu-kvm is provided by qemu-system.	2013-07-25 22:34:46 +04:00
Michael Shigorin	c8d92ab767	http-server: drop php5-rrdtool Thanks glebfm@ for spotting and reporting bitrot; these pkglists were copied from m-p-d during server-light reproduction.	2013-07-25 22:27:42 +04:00
Michael Shigorin	282257d479	sound: get udev-alsa back It's old, it uses consolekit (even if not neccessarily), it borders obsolescence but removal of udev-alsa has caused massive regressions (e.g. regular-gnome3 had soundcard mixer levels dropped to zero from the start, regular-razorqt added inability to poweroff to that...). Just get it back.	2013-07-23 23:01:05 +04:00
Michael Shigorin	6063a9913f	armh.mk: use centaurus branding for cubox-mate Thanks boyarsh@ and cas@ for pointing out that the branding that takes MATE peculiarities (e.g. background settings) into account is in Sisyphus/armh already.	2013-07-23 11:36:22 +00:00
Michael Shigorin	3820a3cb26	regular.mk: regular-tde += openscada Following cubox-tde it's just plain reasonable to add OpenSCADA to the regular one ;-)	2013-07-23 14:23:47 +04:00
Michael Shigorin	ce6c4b6bf2	gear-store-tags	2013-07-22 23:44:29 +04:00
Michael Shigorin	c1366d3195	1.1.3-alt1 - armh fixes and tweaks	2013-07-22 23:43:42 +04:00
Michael Shigorin	4db16f0eb8	armh.mk: initial TDE image This one is IMHO best suited DE for cubox' meagre performance (especially on I/O side due to microSD) as it incurs quite modest I/O, CPU and RAM footprint quite suitable for PII-300 times (cubox feels quite like that but has lots of RAM compared to even maxed-out Pentium II workstation). The image includes OpenSCADA as a nice and unique feature which has been developed with TDE environment in mind and was used on ARM hardware like N900, incidentally; thanks aen@ for this suggestion.	2013-07-22 23:40:59 +04:00
Michael Shigorin	5c943e1cdf	initial openscada pkglist Thanks rom_as@ for the entire OpenSCADA project and packages as well as for keeping TDE packages alive and kickin' in Sisyphus.	2013-07-22 23:40:58 +04:00
Michael Shigorin	615d1793ab	armh.mk: rebased cubox images Most of these are slated to employ oem feature by now, no sense to call it in almost every dependency chain; the only image left with predefined locale and credentials is cubox-xfce-ru.	2013-07-22 23:40:58 +04:00
Michael Shigorin	fc3569a491	x11-autostart: tweak for oem case The nuance being that: - alterator-setup package would change default.target for systemd providing a symlink of its own and making a backup of what was there (rc3 basically); - 40-x11-autostart would ignore that backup; - 99-oem-setup would do nothing about it all either; - alterator-setup removal would restore rc3 symlink. It's not pretty either, something more robust should be invented some day.	2013-07-22 23:40:58 +04:00
Michael Shigorin	dc8799be08	desktop+kde4: added Ukrainian translations Basically forgot to add after initial testing.	2013-07-22 23:40:58 +04:00
Michael Shigorin	8e87358b66	net-eth: fix defaults It came unnoticed that USE_IFPLUGD clashes with CONFIG_WIRELESS which is the default for eth ifaces.	2013-07-22 23:40:58 +04:00
Michael Shigorin	5a09eed232	armh.mk: initial cubox-kde4 It's a bit heavy but still works.	2013-07-22 23:40:58 +04:00
Michael Shigorin	93a8a89103	armh.mk: use/cleanup/installer dropped That one conflicted with alterator-setup by removing what it needs... should be done differently.	2013-07-22 23:40:58 +04:00
Michael Shigorin	4918019b29	tar2fs: use -s Luke Really no need to test and sleep when there's sync mode.	2013-07-22 23:40:58 +04:00
Michael Shigorin	0cb540acf2	gear-store-tags	2013-07-15 22:22:33 +04:00
				`@@ -1 +0,0 @@`
				`Эта фича устарела, более общая называется net-eth.`