1.1.3-alt1

- armh fixes and tweaks
armh.mk: initial TDE image
2013-07-22 23:43:42 +04:00 · 2013-07-22 23:40:59 +04:00 · 2013-07-22 23:40:58 +04:00 · 2013-07-22 23:40:58 +04:00 · 2013-07-22 23:40:58 +04:00 · 2013-07-22 23:40:58 +04:00
42 changed files with 134 additions and 90 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.3
 Release: alt1
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,12 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 %changelog
 * 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/81cd24c1e02661fd22702a24e63e18d08d1aeb96
+++ b/.gear/tags/81cd24c1e02661fd22702a24e63e18d08d1aeb96
@@ -0,0 +1,6 @@
 object 9c09cd1447852d6d5b80bd33d10a99b9fb2b722d
 type commit
 tag v1.1.2
 tagger Michael Shigorin <mike@altlinux.org> 1373912540 +0400
 control sound
--- 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
+81cd24c1e02661fd22702a24e63e18d08d1aeb96 v1.1.2
--- 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
@@ -5,7 +5,7 @@ ifeq (ve,$(IMAGE_CLASS))
 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 +18,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
@@ -36,7 +36,7 @@ vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/vm-ssh; @:
 	@$(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
+	use/repo use/branding use/xdg-user-dirs/deep +pulse
 	@$(call set,KFLAVOURS,cubox)
 	@$(call set,BRANDING,altlinux-kdesktop)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
@@ -49,16 +49,25 @@ 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-base: vm/.cubox-bare use/oem; @:
 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 \
+vm/cubox-xfce-ru: vm/.cubox-bare use/deflogin/altlinuxroot \
-	use/domain-client +nm; @:
+	use/slinux/arm use/x11/lightdm/gtk use/x11-autologin +nm
 vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
 	@$(call add,BASE_PACKAGES,livecd-ru)
-vm/cubox-mate: vm/.cubox-gtk use/x11/mate +nm; @:
+# these images use a king of OEM setup
 vm/.cubox-gtk: vm/.cubox-base 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; @:
 vm/cubox-tde: vm/.cubox-base use/net-eth/dhcp use/x11-autostart +tde
 	@$(call add,BASE_LISTS,openscada)
 vm/cubox-kde4: vm/.cubox-base use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse
 	@$(call add,BASE_LISTS,$(call tags,desktop && kde4 && !extra))
 endif
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -49,9 +49,9 @@ 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/alsa
 	@$(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/regular.mk
+++ b/conf.d/regular.mk
@@ -49,7 +49,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
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm; @:
 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
@@ -70,7 +70,7 @@ distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
 	@$(call add,LIVE_PACKAGES,kdegames kdeedu)
 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 +81,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 \
+distro/regular-server: distro/.regular-bare +installer +sysvinit +power \
-	use/bootloader/grub use/firmware use/server/mini
+	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/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-sshd-root
+++ b/features.in/armh/rootfs/image-scripts.d/50-sshd-root
@@ -2,9 +2,6 @@
 # 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
--- 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
+# take the latter part for complex-specified subprofiles like stage2@live;
-SUBDIRS = $(SUBPROFILE_DIRS)
+# 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:
 	@$(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/homeros/config.mk
+++ b/features.in/homeros/config.mk
@@ -1,4 +1,4 @@
-use/homeros:
+use/homeros: use/control/sudo-su
 	@$(call add_feature)
 #	@$(call set,BRANDING,simply-linux)
 #	@$(call add,THE_BRANDING,menu xfce-settings)
--- 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/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-usershares/README
+++ b/features.in/net-usershares/README
@@ -0,0 +1,5 @@
 Эта фича выполняет предварительное конфигурирование системы
 для работы плагинов файл-менеджеров, реализующих взаимодействие
 с Samba-сервером для динамического создания разделяемых файловых
 ресурсов ("пользовательских шар").  Без добавления соответствующего
 файл-менеджера и нужного плагина смысла не имеет.
--- a/features.in/services/README
+++ b/features.in/services/README
@@ -8,3 +8,8 @@
 Выключение сервиса в каждой из этих пар имеет приоритет перед
 включением.
 Внимание: фича опирается на субпрофиль rootfs, он должен быть
 задействован в каком-либо качестве, чтобы ожидаемое произошло.
 На данный момент действие rootfs не распространяется на системы,
 устанавливаемые при помощи install2.
--- 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,15 @@
 +pulse: use/sound/pulse; @:
 # common ALSA based part
 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)
 # PulseAudio (useful for per-app levels, dynamic devices and networked sound)
 use/sound/pulse: use/sound
 	@$(call add,THE_LISTS,pulseaudio)
--- 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
@@ -83,9 +83,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
+use/x11/gnome3: use/x11/xorg +pulse
-	@$(call add,THE_PACKAGES,gnome3-default)
+	@$(call add,THE_PACKAGES,gnome3-default gst-libav)
 	@$(call add,THE_PACKAGES,gst-libav pulseaudio-daemon)
 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
+# tweak xdg-user-dirs defaults if told so
-# (using tuples like "PHOTOS:Documents/Pictures")
+# using tuples like "PHOTOS:Documents/Pictures"
 . shell-config
 CONFIG="/etc/xdg/user-dirs.defaults"
-if control xdg-user-dirs enabled; then
+[ -z "$GLOBAL_XDG_USER_DIRS" ] ||
-	if [ -n "$GLOBAL_XDG_USER_DIRS" ]; then
+	echo "$GLOBAL_XDG_USER_DIRS" \
-		echo "$GLOBAL_XDG_USER_DIRS" \
+	| tr ' ' '\n' \
 		| tr ' ' '\n' \
 		| while IFS=':' read k v; do
 			[ -n "$k" -a -n "$v" ] || continue
 			shell_config_set "$CONFIG" "$k" "$v"
 		done
 	fi
 fi
--- 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+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/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
Author	SHA1	Message	Date
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 +1 @@`
	`c04d762aaa33d776387780e0f65c95be05b6e5d9 v1.1.0`	`81cd24c1e02661fd22702a24e63e18d08d1aeb96 v1.1.2`
`@@ -1,2 +1,2 @@`
	`use/armh:`	`use/armh: use/control/sudo-su`
	`@$(call add_feature)`	`@$(call add_feature)`
		`@@ -0,0 +1,2 @@`
							`Эта фича предоставляет интерфейс для конфигурирования дистрибутивных`
							`значений по умолчанию control(8); см. тж. http://altlinux.org/control`
		`@@ -0,0 +1,2 @@`
							`Эта фича добавляет поддержку аудиоподсистемы (как ядерную,`
							`если не включена в kernel-image, так и утилиты).`
		`@@ -0,0 +1,2 @@`
							`openscada-Model.AGLKS`
							`openscada-Model.Boiler`