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
10 changed files with 34 additions and 24 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.3
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,9 @@ 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

--- 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/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
+81cd24c1e02661fd22702a24e63e18d08d1aeb96 v1.1.2
--- 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
@@ -36,8 +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 \
-	+pulse
+	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)
@@ -50,17 +49,26 @@ 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-xfce-ru: vm/.cubox-bare use/deflogin/altlinuxroot \
+	use/slinux/arm use/x11/lightdm/gtk use/x11-autologin +nm
+	@$(call add,BASE_PACKAGES,livecd-ru)
+
+# these images use a king of OEM setup
 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
-	@$(call add,BASE_PACKAGES,livecd-ru)
+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

 endif
--- 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/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/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+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
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