1.1.8-alt1

- armh/p7/ve fixes
ve.mk: use/repo for ve/generic
2013-09-16 21:01:04 +04:00 · 2013-09-16 21:01:04 +04:00 · 2013-09-16 21:01:04 +04:00 · 2013-09-16 21:01:04 +04:00 · 2013-09-16 21:01:04 +04:00 · 2013-09-16 21:01:04 +04:00
75 changed files with 279 additions and 178 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.1.1
+Version: 1.1.8
 Release: alt1

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

 %changelog
+* Mon Sep 16 2013 Michael Shigorin <mike@altlinux.org> 1.1.8-alt1
+- armh/p7/ve fixes
+
+* 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
+
 * Mon Jul 01 2013 Michael Shigorin <mike@altlinux.org> 1.1.1-alt1
 - cuboxism

--- a/.gear/tags/390047d385a32ad4481c63e9b945343f259d75ed
+++ b/.gear/tags/390047d385a32ad4481c63e9b945343f259d75ed
@@ -0,0 +1,6 @@
+object 15a0e6769e8c490b4283845c8b8641cf345dd1c8
+type commit
+tag v1.1.7
+tagger Michael Shigorin <mike@altlinux.org> 1377526131 +0300
+
+minor fixes
--- a/.gear/tags/c04d762aaa33d776387780e0f65c95be05b6e5d9
+++ b/.gear/tags/c04d762aaa33d776387780e0f65c95be05b6e5d9
@@ -1,6 +0,0 @@
-object 386c1b14a371c5fa3309a86a8dc8d9b3eeaaac84
-type commit
-tag v1.1.0
-tagger Michael Shigorin <mike@altlinux.org> 1371486056 +0400
-
-1.1 branch
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-c04d762aaa33d776387780e0f65c95be05b6e5d9 v1.1.0
+390047d385a32ad4481c63e9b945343f259d75ed v1.1.7
--- 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
@@ -20,7 +20,9 @@ fi
 [ -n "$GLOBAL_DEBUG" ] || message "WORKDIR: $WORKDIR"

 MB=1048576		# a parted's "megabyte" in bytes is *broken*
+
 SIZE_FACTOR=2		# multiply the sizes found by this value
+BOOT_SIZE_FACTOR=2	# multiply /boot size by this value additionally

 CUR_BOUNDARY=0		# align first partition at 1MB for performance (+1)

@@ -87,15 +89,15 @@ IMG="$2"
 ROOTSIZE="$3"
 [ -n "$ROOTSIZE" -a "$ROOTSIZE" != 0 ] || unset ROOTSIZE

-# image size in bytes (note the final ceil rounding to megabytes)
+# image size in bytes
 TARSIZE="$(stat -Lc %s "$TAR")"
 # /boot size in that tarball
 BOOTSIZE="$(boot_size "$TAR")"
 DEFSIZE="$(($SIZE_FACTOR * ($TARSIZE - $BOOTSIZE)))"	# (exact sizes)
-ROOTSIZE="$((${ROOTSIZE:-$DEFSIZE} + $MB - 1))"
+ROOTSIZE="$((${ROOTSIZE:-$DEFSIZE} + $MB - 1))"	# for ceil rounding to MB
 # image and /boot sizes in megabytes
 ROOTSIZEM="$(($ROOTSIZE / $MB))"
-BOOTSIZEM="$((($SIZE_FACTOR * $BOOTSIZE + $MB - 1) / $MB))"
+BOOTSIZEM="$((($SIZE_FACTOR * $BOOT_SIZE_FACTOR * $BOOTSIZE + $MB - 1) / $MB))"

 # tested to work: ext[234], jfs
 # NB: xfs doesn't have a spare sector for the bootloader
@@ -155,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,10 +2,16 @@ ifeq (armh,$(ARCH))

 ifeq (ve,$(IMAGE_CLASS))

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

-ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3
+ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3 +pulse
 	@$(call add,BASE_LISTS,$(call tags,base tablet))

 ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \
@@ -18,7 +24,7 @@ ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \

 ve/nexus7-e17: ve/.nexus7-tablet use/x11/e17 use/x11/lightdm/gtk; @:

-ve/nexus7-kde4: ve/.nexus7-tablet use/x11/lightdm/kde +systemd
+ve/nexus7-kde4: ve/.nexus7-tablet use/x11/lightdm/kde +systemd +pulse +nm
 	@$(call add,BASE_LISTS,$(call tags,base kde4mobile))

 ve/nexus7-xfce: ve/.nexus7-tablet use/x11/xfce use/x11/lightdm/gtk +systemd
@@ -29,18 +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
-	@$(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)
@@ -49,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)

-vm/cubox-mate: vm/.cubox-gtk use/x11/mate +nm; @:
+# 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,9 +49,8 @@ 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
+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,LIVE_PACKAGES,alsa-utils udev-alsa)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')

 distro/live-webkiosk-mini: distro/.live-webkiosk
--- a/conf.d/p7.mk
+++ b/conf.d/p7.mk
@@ -1,9 +1,10 @@
 # p7 base kits
-ifeq (distro,$(IMAGE_CLASS))

 mixin/p7:
 	@$(call set,BRANDING,altlinux-starterkit)

+ifeq (distro,$(IMAGE_CLASS))
+
 ### kludge compatibility: introspection stub for ../main.mk :-/
 distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
 distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
@@ -17,4 +18,10 @@ distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
 distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
 distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:

+distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
+
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/altlinux-p7: ve/generic mixin/p7; @:
 endif
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -50,6 +50,7 @@ endif
 distro/regular-xfce: distro/.regular-gtk use/x11/xfce +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,11 +67,12 @@ 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 +plymouth
+	use/fonts/zerg +pulse +plymouth
 	@$(call add,LIVE_LISTS,$(call tags,regular kde4))

 distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
@@ -81,8 +83,9 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \
 	use/syslinux/ui/menu use/hdt use/efi/refind
 	@$(call set,KFLAVOURS,un-def)

-distro/regular-server: distro/.regular-bare +installer \
-	use/bootloader/grub use/firmware use/server/mini
+distro/regular-server: distro/.regular-bare +installer +sysvinit +power \
+	use/install2/fs use/bootloader/lilo use/firmware use/server/mini
 	@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
+	@$(call set,INSTALLER,desktop)

 endif
--- 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/ve.mk
+++ b/conf.d/ve.mk
@@ -1,15 +1,15 @@
 ifeq (ve,$(IMAGE_CLASS))

 # no "vzctl enter"
-ve/bare: ve/.base
-	@$(call add,BASE_PACKAGES,sysvinit)
+ve/bare: ve/.base use/init/sysv; @:

 # /dev/pty and friends start here
 ve/base: ve/bare
 	@$(call add,BASE_PACKAGES,interactivesystem)

-# this should be more or less deployable
-ve/generic: ve/base
+# this should be more or less convenient
+ve/generic: ve/base use/repo
+	@$(call add,BASE_PACKAGES,vim-console etckeeper)
 	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))

--- 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/config.mk
+++ b/features.in/armh/config.mk
@@ -1,2 +1,2 @@
-use/armh:
+use/armh: use/control/sudo-su
 	@$(call add_feature)
--- a/features.in/armh/rootfs/image-scripts.d/50-sudo-su
+++ b/features.in/armh/rootfs/image-scripts.d/50-sudo-su
@@ -1,11 +0,0 @@
-#!/bin/sh
-# poor man's root switch
-# NB: 50-users creates predefined users
-
-control su public
-control sudo public
-
-cat >> /etc/openssh/sshd_config << EOF
-PermitRootLogin yes
-UseDNS no
-EOF
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -1,7 +1,8 @@
 # step 4: build the distribution image

-# take the latter part for complex-specified subprofiles like stage2@live
-SUBDIRS = $(SUBPROFILE_DIRS)
+# take the latter part for complex-specified subprofiles like stage2@live;
+# care to exclude non-directories holding no makefiles like rootfs
+SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))

 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)
@@ -23,7 +24,7 @@ prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 # can't use mp-showref which belongs to the metaprofile
 dot-disk:
 	@mkdir -p files/.disk
-	@echo "ALT Linux based" >files/.disk/info
+	@echo "$(META_VOL_ID)" >files/.disk/info
 	@echo "$(ARCH)" >files/.disk/arch
 	@echo "$(DATE)" >files/.disk/date
 	@if type -t git >&/dev/null; then \
--- a/features.in/control/README
+++ b/features.in/control/README
@@ -0,0 +1,2 @@
+Эта фича предоставляет интерфейс для конфигурирования дистрибутивных
+значений по умолчанию control(8); см. тж. http://altlinux.org/control
--- a/features.in/control/config.mk
+++ b/features.in/control/config.mk
@@ -0,0 +1,8 @@
+use/control:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,control)
+	@$(call xport,CONTROL)
+
+# some presets
+use/control/sudo-su: use/control
+	@$(call add,CONTROL,su:public sudo:public)
--- a/features.in/control/rootfs/image-scripts.d/50-control
+++ b/features.in/control/rootfs/image-scripts.d/50-control
@@ -0,0 +1,11 @@
+#!/bin/sh
+# setup control(8) states
+
+[ -z "$GLOBAL_CONTROL" ] ||
+	echo "$GLOBAL_CONTROL" \
+	| tr ' ' '\n' \
+	| while IFS=':' read facility state; do
+		[ -z "$facility" -o -z "$state" ] ||
+			control "$facility" "$state"
+	done
+:
--- a/features.in/deflogin/config.mk
+++ b/features.in/deflogin/config.mk
@@ -1,7 +1,7 @@
 # WARNING: the variable values are stored in build config/log!
 use/deflogin:
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES,shadow-utils)
+	@$(call add,THE_PACKAGES,shadow-utils passwd)
 	@$(call xport,ROOTPW)
 	@$(call xport,USERS)
 	@$(call xport,GROUPS)
--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
@@ -1,6 +1,7 @@
-use/dev:
+use/dev: use/control
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,git-core hasher gear)
+	@$(call add,CONTROL,pam_mktemp:enabled)

 use/dev/mkimage: use/dev
 	@$(call add,THE_PACKAGES,mkimage shadow-change su)
--- a/features.in/dev/live/image-scripts.d/40-hasher
+++ b/features.in/dev/live/image-scripts.d/40-hasher
@@ -28,7 +28,6 @@ fi

 # $TMP
 TMP="/tmp/.private/$USER"
-control pam_mktemp enabled
 sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
 echo "%_tmppath	$TMP" >> "$HOME/.rpmmacros"

--- 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/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:
 	@$(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-sudo
+++ b/features.in/homeros/live/image-scripts.d/10-sudo
@@ -2,5 +2,3 @@

 mkdir -p /etc/sudo.d
 chmod 700 /etc/sudo.d
-control su public
-control sudo public
--- 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/init/config.mk
+++ b/features.in/init/config.mk
@@ -5,8 +5,11 @@ use/init:
 	@$(call add_feature)
 	@$(call add,THE_LISTS,$$(INIT_TYPE))

+# THE_LISTS is too late when BASE_PACKAGES have pulled in
+# the wrong syslogd-daemon provider already
 use/init/sysv: use/init
 	@$(call set,INIT_TYPE,sysvinit)
+	@$(call add,BASE_PACKAGES,syslogd)

 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -18,7 +18,7 @@ use/live/rw: use/live; @:
 endif

 # graphical target (not enforcing xorg drivers or blobs)
-use/live/x11: use/live/base use/x11-autologin use/live/sound +power +efi
+use/live/x11: use/live/base use/x11-autologin use/sound +power +efi
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_LISTS,$(call tags,base l10n))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
@@ -40,7 +40,7 @@ use/live/repo/online:
 	@$(call add,LIVE_PACKAGES,livecd-online-repo)

 # alterator-based permanent installation
-use/live/install: use/metadata use/syslinux/localboot.cfg
+use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,livecd-install)
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)

@@ -66,6 +66,3 @@ use/live/hooks: use/live
 # a crude hack to make sure Russian is supported in a particular image
 use/live/ru: use/live
 	@$(call add,LIVE_PACKAGES,livecd-ru)
-
-use/live/sound: use/live
-	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -1,6 +1,6 @@
 +ltsp: use/ltsp/base; @:

-use/ltsp:
+use/ltsp: use/sound
 	@$(call add_feature)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
 	@$(call add,MAIN_LISTS,ltsp-client)
--- a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
+++ b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
@@ -37,7 +37,8 @@ write_iface() {
 		echo "DISABLED=no"
 		echo "BOOTPROTO=$proto"
 		echo "NM_CONTROLLED=$NMCTL"
-		echo "USE_IFPLUGD=yes"
+		echo "DISABLED=$NMCTL"
+		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-usershares/README
+++ b/features.in/net-usershares/README
@@ -0,0 +1,5 @@
+Эта фича выполняет предварительное конфигурирование системы
+для работы плагинов файл-менеджеров, реализующих взаимодействие
+с Samba-сервером для динамического создания разделяемых файловых
+ресурсов ("пользовательских шар").  Без добавления соответствующего
+файл-менеджера и нужного плагина смысла не имеет.
--- 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/power/config.mk
+++ b/features.in/power/config.mk
@@ -1,14 +1,14 @@
 +power: use/power/acpi/button use/power/acpi/cpufreq; @:

 # common
-# TODO: invent multi-target scripts and integrate that 08-powerbutton
-use/power:
+use/power: sub/rootfs use/services
 	@$(call add_feature)
 	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)

 # modern power management
 use/power/acpi: use/power
 	@$(call add,COMMON_PACKAGES,acpid acpi)
+	@$(call add,DEFAULT_SERVICES_ENABLE,acpid)

 use/power/acpi/button: use/power/acpi
 	@$(call add,COMMON_PACKAGES,acpid-events-power)
@@ -18,7 +18,10 @@ use/power/acpi/cpufreq: use/power/acpi

 use/power/acpi/powersave: use/power/acpi
 	@$(call add,COMMON_PACKAGES,powersave)
+	@$(call add,DEFAULT_SERVICES_DISABLE,acpid)	# override
+	@$(call add,DEFAULT_SERVICES_ENABLE,powersaved)

 # legacy power management
 use/power/apm: use/power
 	@$(call add,COMMON_PACKAGES,apmd lphdisk)
+	@$(call add,DEFAULT_SERVICES_ENABLE,apmd)
--- a/features.in/power/rootfs/image-scripts.d/50-power
+++ b/features.in/power/rootfs/image-scripts.d/50-power
@@ -0,0 +1,6 @@
+#!/bin/sh -efu
+
+# provide kernel interface for ACPI power button
+if [ -x /etc/init.d/acpid ]; then
+	grep -qsx button /etc/modules || echo button >> /etc/modules
+fi
--- a/features.in/services/README
+++ b/features.in/services/README
@@ -8,3 +8,8 @@

 Выключение сервиса в каждой из этих пар имеет приоритет перед
 включением.
+
+Внимание: фича опирается на субпрофиль rootfs, он должен быть
+задействован в каком-либо качестве, чтобы ожидаемое произошло.
+На данный момент действие rootfs не распространяется на системы,
+устанавливаемые при помощи install2.
--- 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/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -4,7 +4,7 @@ use/slinux: use/x11/xfce
 	@$(call add,THE_BRANDING,menu xfce-settings)
 	@$(call set,META_VOL_SET,Simply Linux)

-use/slinux/base: use/slinux use/x11/gdm2.20
+use/slinux/base: use/slinux use/x11/gdm2.20 +pulse
 	@$(call add,THE_LISTS,gnome-p2p)
 	@$(call add,THE_LISTS,slinux/$(ARCH))
 	@$(call add,THE_LISTS,slinux/games)
--- a/features.in/sound/README
+++ b/features.in/sound/README
@@ -0,0 +1,2 @@
+Эта фича добавляет поддержку аудиоподсистемы (как ядерную,
+если не включена в kernel-image, так и утилиты).
--- a/features.in/sound/config.mk
+++ b/features.in/sound/config.mk
@@ -0,0 +1,11 @@
+pulse: use/sound/pulse; @:
+
+# "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 udev-alsa)
+
+# PulseAudio (useful for per-app levels, dynamic devices and networked sound)
+use/sound/pulse: use/sound
+	@$(call add,THE_LISTS,pulseaudio)
--- 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
@@ -83,9 +87,8 @@ use/x11/xfce: use/x11
 use/x11/cinnamon: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,cinnamon desktop))

-use/x11/gnome3: use/x11/xorg
-	@$(call add,THE_PACKAGES,gnome3-default)
-	@$(call add,THE_PACKAGES,gst-libav pulseaudio-daemon)
+use/x11/gnome3: use/x11/xorg +pulse
+	@$(call add,THE_PACKAGES,gnome3-default gst-libav)

 use/x11/e17: use/x11 use/net/connman
 	@$(call add,THE_LISTS,$(call tags,e17 desktop))
--- a/features.in/xdg-user-dirs/config.mk
+++ b/features.in/xdg-user-dirs/config.mk
@@ -1,5 +1,6 @@
-use/xdg-user-dirs:
+use/xdg-user-dirs: use/control
 	@$(call add_feature)
+	@$(call add,CONTROL,xdg-user-dirs:enabled)
 	@$(call add,THE_PACKAGES,xdg-user-dirs)
 	@$(call xport,XDG_USER_DIRS)

--- a/features.in/xdg-user-dirs/rootfs/image-scripts.d/35-xdg-user-dirs
+++ b/features.in/xdg-user-dirs/rootfs/image-scripts.d/35-xdg-user-dirs
@@ -1,18 +1,15 @@
 #!/bin/sh
-# turn on xdg-user-dirs.and tweak its defaults if told so
-# (using tuples like "PHOTOS:Documents/Pictures")
+# tweak xdg-user-dirs defaults if told so
+# using tuples like "PHOTOS:Documents/Pictures"

 . shell-config

 CONFIG="/etc/xdg/user-dirs.defaults"

-if control xdg-user-dirs enabled; then
-	if [ -n "$GLOBAL_XDG_USER_DIRS" ]; then
-		echo "$GLOBAL_XDG_USER_DIRS" \
-		| tr ' ' '\n' \
+[ -z "$GLOBAL_XDG_USER_DIRS" ] ||
+	echo "$GLOBAL_XDG_USER_DIRS" \
+	| tr ' ' '\n' \
 		| while IFS=':' read k v; do
 			[ -n "$k" -a -n "$v" ] || continue
 			shell_config_set "$CONFIG" "$k" "$v"
 		done
-	fi
-fi
--- 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/ltsp
+++ b/pkg.in/lists/ltsp
@@ -7,8 +7,6 @@ alterator-standalone

 alsa-plugins
 alsa-plugins-pulse
-alsa-utils
-aplay
 mplayer

 syslinux
--- a/pkg.in/lists/openscada
+++ b/pkg.in/lists/openscada
@@ -0,0 +1,2 @@
+openscada-Model.AGLKS
+openscada-Model.Boiler
--- a/pkg.in/lists/pulseaudio
+++ b/pkg.in/lists/pulseaudio
@@ -0,0 +1,6 @@
+pulseaudio-daemon
+
+pulseaudio-utils
+pavucontrol
+
+alsa-plugins-pulse
--- a/pkg.in/lists/slinux/arm
+++ b/pkg.in/lists/slinux/arm
@@ -59,10 +59,6 @@ update-kernel
 printer-drivers-base
 udev-extras
 libnss-mdns
-pulseaudio-daemon
-pulseaudio-utils
-pavucontrol
-alsa-plugins-pulse
 fdisk
 cpufreq-simple
 attr
--- a/pkg.in/lists/slinux/misc
+++ b/pkg.in/lists/slinux/misc
@@ -52,10 +52,6 @@ printer-drivers-base
 udev-extras
 hostname-hook-hosts
 libnss-mdns
-pulseaudio-daemon
-pulseaudio-utils
-pavucontrol
-alsa-plugins-pulse
 fdisk
 cpufreq-simple
 attr
--- a/pkg.in/lists/slinux/network
+++ b/pkg.in/lists/slinux/network
@@ -32,5 +32,4 @@ NetworkManager-vpnc-gnome
 #NetworkManager-l2tp-gnome
 usb-modeswitch

-alsa-utils
 dialog
--- a/pkg.in/lists/tagged/base+tablet
+++ b/pkg.in/lists/tagged/base+tablet
@@ -8,14 +8,6 @@ setxkbmap
 fonts-ttf-dejavu
 fonts-ttf-droid

-alsa-utils
-amixer
-aplay
-
-pulseaudio-daemon
-pulseaudio-utils
-pavucontrol
-
 rfkill
 wpa_supplicant

--- 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
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -23,3 +23,6 @@ lxde-settings-upstream

 lxde-icon-theme
 tango-icon-theme
+
+# reboot/poweroff in logout menu as of July, 2013
+ConsoleKit
--- 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/pkg.in/lists/tagged/regular+kde4
+++ b/pkg.in/lists/tagged/regular+kde4
@@ -2,14 +2,13 @@ kde4-regular

 plasma-applet-networkmanager

-pulseaudio-daemon
-alsa-plugins-pulse
 phonon-gstreamer
-pavucontrol

 synaptic-kde
 synaptic-usermode-
+
 gtk2-theme-oxygen-gtk
 gtk3-theme-oxygen-gtk
+
 altlinux-freedesktop-menu-kde4
 altlinux-freedesktop-menu-shallow-menu
--- a/pkg.in/lists/tagged/regular+server
+++ b/pkg.in/lists/tagged/regular+server
@@ -1,4 +1,3 @@
-sysklogd
 vim-console
 nano
 mc
--- 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	418cc79195	1.1.8-alt1 - armh/p7/ve fixes	2013-09-16 21:01:04 +04:00
Michael Shigorin	7bdda821e7	ve.mk: use/repo for ve/generic Setting up apt configuration in every container is pretty annoying, let's enable it by default. Some provision to add/enable local mirror would be beneficial but not there yet...	2013-09-16 21:01:04 +04:00
Michael Shigorin	3bad58987b	p7.mk: ve/altlinux-p7 bridge This one adds another image class as well. Hope this kludge will not get self-conscious...	2013-09-16 21:01:04 +04:00
Michael Shigorin	441a5bdfbd	ve.mk: tweaked ve/generic etckeeper was suggested by george@ along with vim-console; the latter should come by server,base tags but so far does not (splitting server-base list into common, bare metal and virtualized parts in haste looked suboptimal).	2013-09-16 21:01:04 +04:00
Michael Shigorin	3161c43467	ve.mk: employ init feature It should actually work better than manual specification now that it's fixed.	2013-09-16 21:01:04 +04:00
Michael Shigorin	b2a1befe25	init: we don't need no systemd with sysvinit That is, no need to pull in systemd as syslogd-daemon provider when an unspecified one has been requested by interactivesystem or anything else. The tricky issue is that THE_LISTS will get expanded separately and too late to specify a particular provider which will have been auto-chosen while expanding e.g. BASE_PACKAGES.	2013-09-16 21:01:04 +04:00
Michael Shigorin	f43d68ce62	power: employ services feature rootfs got handy either though managing modules to preload might be enhanced further.	2013-09-13 17:33:58 +04:00
Michael Shigorin	93371601fb	p7.mk: add regular-server bridge This proxy makefile is still needed unfortunately...	2013-09-13 17:33:58 +04:00
Michael Shigorin	d931d69ddd	armh.mk: fix nexus7 aliases So the autobuilds were failing for these two weeks since commit `e43386c1fe` was totally braindead: there's no "arm-e17" target neither "arm-kde4" one. Fixed while awake and adjusted (in sync with build node) to reference particular nexus7 and not just "arm". The sad thing is that it should now read "nexus7old" TBH, 2013 model is not Linux friendly at all at the moment...	2013-09-13 17:33:58 +04:00
Michael Shigorin	bd9fef2c2c	gear-store-tags	2013-08-26 17:08:54 +03:00
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
Michael Shigorin	9c09cd1447	1.1.2-alt1 - control and sound features	2013-07-15 22:21:37 +04:00
Michael Shigorin	72986b5321	build-distro: un-hardwire .disk/info It used to be a hasty static string; something like "ALT Linux regular-e17/x86_64" seems more relevant.	2013-07-15 21:32:13 +04:00
Michael Shigorin	a10125ffb2	services: update README The extent of this feature's action should be clear as well as its prerequisite.	2013-07-15 21:20:59 +04:00
Michael Shigorin	da65dc2fd9	build-distro: skip pseudo subprofiles rootfs presented a special case when there is no resulting directory at all as it gets merged with the target subprofile by design. Still those features adding only rootfs scripts need to depend on it but this resulted in an attempt to process a missing subdir. This is brought back to sanity now.	2013-07-15 21:20:59 +04:00
Michael Shigorin	33e154dd7e	net-usershares: added missing README `make check' must be included in my release process :-/	2013-07-15 21:20:59 +04:00
Michael Shigorin	f110716ae6	armh.mk: tiny dedup in cubox-xfce vm/.cubox-gtk already pulls +nm in, no need to do it again.	2013-07-15 21:20:59 +04:00
Michael Shigorin	607aa1b7d8	regular.mk: regular-server revisited Few things: - extend feature specification + SysVinit can be chosen explicitly via init feature, no need to keep sysklogd in yet another pkglist; + power management should be included too (both cpufreq setup and power button handling); + LILO seems to be heavily preferred among the target audience :) - use desktop installer for regular-server + the seeming controversy is explained easily: installer-distro-altlinux-generic has very few modules to the point of being inconvenient for anything but quick rounds of basic testing, and distributions rather do need network setup along with a non-privileged user.	2013-07-15 21:15:44 +04:00
Michael Shigorin	7afce7b46c	desktop+lxde: added ConsoleKit The funny thing while debugging this was "how the heck could a sound related change induce privilege related shift?" -- turns out that udev-alsa (which pulls in ConsoleKit) was the culprit... looks like LXDE hasn't dumped it yet :)	2013-07-15 21:14:45 +04:00
Gleb F-Malinovskiy	81a6ab9ec1	tar2fs: double /boot size Factor of 2 is not enough for kernel upgrade due to filesystem overhead. Add BOOT_SIZE_FACTOR on top of that.	2013-07-15 13:56:00 +04:00
Michael Shigorin	d79061fb44	xdg-user-dirs: employ control feature Maybe the conditionals shouldn't be too terse, by the way...	2013-07-15 13:56:00 +04:00
Michael Shigorin	f123fea698	dev: employ control feature ...instead of setting up pam_mktemp ourselves even if that was no big deal too.	2013-07-15 13:56:00 +04:00
Michael Shigorin	f059955d31	armh: employ control feature As 50-sudo-su script cares for sudo and su control facilities no more that hook is aptly renamed to 50-sshd-root (should be generalized either some day).	2013-07-15 13:56:00 +04:00
Michael Shigorin	7666d3ac2d	homeros: employ control feature ...instead of having to do the same by hand.	2013-07-15 13:56:00 +04:00
Michael Shigorin	42e6674120	initial control feature TODO--, and this one was pretty expected after the "invention" of iterators.	2013-07-15 13:56:00 +04:00
Michael Shigorin	37b971f533	net-eth: ensure single-subsystem control Setting NM_CONTROLLED is apparently not enough to disable /etc/net handling of a particular interface; thanks sem@ for noticing the fortunate error messages in logs and explaining this peculiarity to me.	2013-07-15 13:56:00 +04:00
Michael Shigorin	ba857b9e34	deflogin: do require passwd 50-root script uses passwd(1), mea culpa for having optimized it out...	2013-07-15 13:56:00 +04:00
Michael Shigorin	f879c16d80	armh.mk: use sound, net features The main reason was use/net but warranting the bits needed for proper pulseaudio functioning via use/sound seems also logical.	2013-07-15 13:55:59 +04:00
Michael Shigorin	889be05910	armh.mk: employ sound feature This bunch of commits was done so these can be mixed and matched (or even reverted) later if needed; it was tempting to just revamp things wholesale again but coarse grained approach is worse to maintain.	2013-07-15 13:55:59 +04:00
Michael Shigorin	ddca9d469b	slinux: employ sound feature One of the earlier duplicates pruned now.	2013-07-15 13:55:59 +04:00
Michael Shigorin	0b870ef03c	ltsp: employ sound feature The client side might benefit a bit more in the future but the server side does not (and should not) require everything client side does; thus use base ALSA target.	2013-07-15 13:55:59 +04:00
Michael Shigorin	42ed473409	regular.mk: employ sound feature for kde4 An act of deduplication again.	2013-07-15 13:55:59 +04:00
Michael Shigorin	006230139c	x11: employ sound feature gnome3 was just asking to line up either.	2013-07-15 13:55:59 +04:00
Michael Shigorin	f92a36da7d	live: employ sound feature use/live/sound target is dropped on the floor, there were no more in-profile users of it.	2013-07-15 13:55:59 +04:00
Michael Shigorin	e59dca158e	initial sound feature This replaces the many sets of the corresponding packages wandering all over pkglists, features and configurations; the interface should be rather well-defined by now.	2013-07-15 13:55:59 +04:00
Michael Shigorin	ce8e2d2272	regular.mk: add an empty recipe That trailing "; @:" makes up a cause to run a shell, and SHELL is overloaded with tracing for reports. Thus an omission fixup.	2013-07-15 13:55:59 +04:00
Michael Shigorin	1b0d05100c	live: employ xdg-user-dirs feature use/live/install stopped to provide a desktop icon; the nuance is that zdg-user-dirs-install.sh script in livecd-install package expects ~/.config/user-dirs.dirs to actually do that.	2013-07-15 13:55:59 +04:00
Michael Shigorin	6933b7d41e	gear-store-tags	2013-07-01 20:47:48 +00:00
				`@@ -1 +0,0 @@`
				`Эта фича устарела, более общая называется net-eth.`