0.8.1-alt1

- misc fixes
actually useful vm/icewm
2012-09-03 20:22:16 +03:00 · 2012-09-03 19:16:50 +03:00 · 2012-09-03 19:16:50 +03:00 · 2012-09-03 19:16:50 +03:00 · 2012-09-03 19:16:50 +03:00 · 2012-09-03 19:16:50 +03:00
20 changed files with 115 additions and 20 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.0
+Version: 0.8.1
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,9 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Sep 03 2012 Michael Shigorin <mike@altlinux.org> 0.8.1-alt1
+- misc fixes
+
 * Mon Aug 13 2012 Michael Shigorin <mike@altlinux.org> 0.8.0-alt1
 - stage2@live

--- a/.gear/tags/8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32
+++ b/.gear/tags/8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32
@@ -1,6 +0,0 @@
-object 55fda1a044b132323a5b7fbbf109d0dbd9ea69fc
-type commit
-tag v0.7.6
-tagger Michael Shigorin <mike@altlinux.org> 1344283455 +0400
-
-improvements
--- a/.gear/tags/d21fc0e7ffbe1e99ade184ab13b5fe649a103610
+++ b/.gear/tags/d21fc0e7ffbe1e99ade184ab13b5fe649a103610
@@ -0,0 +1,6 @@
+object d1bbbbc10be5df925dd677f7956ed06821192866
+type commit
+tag v0.8.0
+tagger Michael Shigorin <mike@altlinux.org> 1344884693 +0300
+
+stage2@live
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-8c1ac8f38121c21dfeb04a0c38fa9b95bb7d1f32 v0.7.6
+d21fc0e7ffbe1e99ade184ab13b5fe649a103610 v0.8.0
--- a/bin/tar2vm
+++ b/bin/tar2vm
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+# usage:
+# tar2vm chroot.tar image.raw [size_in_bytes]

 . shell-error

@@ -27,7 +29,7 @@ IMG="$2"

 # image size in bytes (256M is a fallback)
 TARSIZE="$(stat -Lc %s "$TAR")"
-DEFSIZE="$((3 * $TARSIZE / 2))"
+DEFSIZE="$((2 * $TARSIZE))"
 DISKSIZE="${3:-${DEFSIZE:-268435456}}"
 # ...and in megabytes
 DISKSIZEM="$(($DISKSIZE / 1048576))"
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -57,7 +57,8 @@ distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
 	use/x11/cinnamon use/x11/3d-proprietary; @:

 distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
-	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && mate))
+	@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
+	@$(call set,KFLAVOURS,un-def)	# the newest one

 distro/live-enlightenment: distro/.live-desktop use/live/autologin \
 	use/live/ru use/x11/3d-free
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -18,6 +18,10 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 distro/live-testserver: distro/live-install use/server/mini
 	@$(call set,KFLAVOURS,std-def el-smp)

+distro/live-gns3: distro/live-icewm
+	@$(call add,LIVE_LISTS,gns3)
+	@$(call add,LIVE_KMODULES,kvm virtualbox)
+
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

@@ -28,6 +32,7 @@ distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \

 distro/desktop-systemd: distro/icewm use/systemd; @:
 distro/desktop-plymouth: distro/icewm +plymouth; @:
+distro/live-mate-systemd: distro/live-mate use/systemd use/live/install; @:

 endif # IMAGE_CLASS: distro

--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -1,9 +1,9 @@
 # virtual machines
 ifeq (vm,$(IMAGE_CLASS))

-# NB: use/x11 employs some installer-feature packages
-vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:
-
 vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:

+# NB: use/x11 employs some installer-feature packages
+vm/icewm: vm/net use/cleanup/installer use/repo +icewm; @:
+
 endif
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -106,6 +106,11 @@
    - пусто (по умолчанию) либо строка (например, "alpha", "beta")
  + см. ../image.in/Makefile

+- VM_SIZE
+  + задаёт размер несжатого образа виртуальной машины в байтах
+  + значение: пусто (по умолчанию двойной размер чрута) или целое
+  + см. ../features.in/build-vm/lib/90-build-vm.mk, ../bin/tar2vm
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -1,4 +1,4 @@
 ###
 use/kernel:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,std-def)
+	@$(call set,KFLAVOURS,un-def)
--- a/features.in/plymouth/config.mk
+++ b/features.in/plymouth/config.mk
@@ -1,8 +1,8 @@
 +plymouth: use/plymouth/full; @:

-# and a few silent aliases
-use/plymouth/live: use/plymouth/stage2
-use/plymouth/install2: use/plymouth/stage2
+# and a few aliases
+use/plymouth/live: use/plymouth/stage2; @:
+use/plymouth/install2: use/plymouth/stage2; @:

 use/plymouth:
 	@$(call add_feature)
--- a/features.in/repo/image-scripts.d/90-enable-repo
+++ b/features.in/repo/image-scripts.d/90-enable-repo
@@ -0,0 +1,20 @@
+#!/bin/sh
+# enable online repos if possible, just quit if anything's wrong
+
+repo_source='/etc/apt/sources.list.d/alt.list'
+host='http://ftp.altlinux.org'
+
+[ -s "$repo_source" ] || exit 0
+
+# regexps from alterator-pkg (via installer-feature-online-repo)
+prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
+updates_re="${prefix_re}http:\/\/\([^[:space:]]\+\)[[:space:]]*"
+
+# architectures
+host_arch="$(rpm --eval '%_host_cpu')"
+[ "$host_arch" = "x86_64" ] && compat="x86_64-i586" || compat=
+
+# turn on unconditionally
+for arch in "$host_arch" noarch "$compat"; do
+	sed -i "s/^#\($updates_re$arch\)/\1/" "$repo_source"
+done
--- a/features.in/systemd/config.mk
+++ b/features.in/systemd/config.mk
@@ -1,4 +1,4 @@
 use/systemd:
 	@$(call add_feature)
 	@$(call add,COMMON_PACKAGES,systemd systemd-units systemd-sysvinit)
-	@$(call add,COMMON_PACKAGES,installer-feature-systemd-stage3)
+	@$(call add,COMMON_PACKAGES,installer-feature-systemd-stage3 chkconfig)
--- a/image.in/image-scripts.d/01rootdir
+++ b/image.in/image-scripts.d/01rootdir
@@ -0,0 +1,6 @@
+#!/bin/sh
+# fixup chroot's toplevel directory permissions (use to become 1775)
+
+chmod 755 /
+
+rm -f /.gitignore
--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -8,7 +8,7 @@ ifeq (vm,$(IMAGE_CLASS))

 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
-	@$(call set,KFLAVOURS,std-def)
+	@$(call set,KFLAVOURS,un-def)

 vm/bare: vm/.bare
 	@$(call add,BASE_PACKAGES,apt)
--- a/pkg.in/lists/gns3
+++ b/pkg.in/lists/gns3
@@ -0,0 +1,15 @@
+gns3
+
+dynamips
+dynagen
+
+qemu
+qemu-kvm
+virtualbox
+
+wireshark
+
+su
+
+livecd-virtualbox
+livecd-online-repo
--- a/pkg.in/lists/tagged/desktop+live
+++ b/pkg.in/lists/tagged/desktop+live
@@ -3,3 +3,4 @@ xinit
 xinitrc
 livecd-setlocale
 installer-feature-runlevel5-stage3
+su
--- a/pkg.in/lists/tagged/desktop+mate
+++ b/pkg.in/lists/tagged/desktop+mate
@@ -15,6 +15,36 @@ mate-session
 #mate-session-manager
 mate-settings-daemon
 mate-themes
-mate-vfs
+mate-vfs gvfs-backends
 mate-vfs-smb
 mate-window-manager
+
+mate-applets
+mate-bluetooth
+mate-calc
+mate-charmap
+mate-document-viewer
+mate-document-viewer-caja
+mate-document-viewer-djvu
+mate-file-archiver
+mate-image-viewer
+mate-media
+mate-media-apps
+mate-netspeed
+mate-power-manager
+mate-screensaver
+mate-terminal
+mate-utils
+mate-utils-mate-system-log
+
+mate-file-manager-extensions
+mate-file-manager-image-converter
+mate-file-manager-open-terminal
+mate-file-manager-sendto
+parcellite
+
+### should be dropped at some stage; see bugreports within this thread:
+# http://lists.altlinux.org/pipermail/sisyphus/2012-August/358079.html
+libmatekbd-capplet
+iso-codes
+tzdata
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -75,6 +75,7 @@ arpwatch
 elinks
 hostinfo
 iftop
+ipmitool
 iproute2
 iptables
 iputils
--- a/sub.in/stage2/image-scripts.d/01rootdir
+++ b/sub.in/stage2/image-scripts.d/01rootdir
@@ -0,0 +1,6 @@
+#!/bin/sh
+# fixup chroot's toplevel directory permissions (use to become 1775)
+
+chmod 755 /
+
+rm -f /.gitignore
Author	SHA1	Message	Date
Michael Shigorin	061f299fa1	0.8.1-alt1 - misc fixes	2012-09-03 20:22:16 +03:00
Michael Shigorin	e52e21781f	actually useful vm/icewm See http://www.opennet.ru/openforum/vsluhforumID3/86239.html#1 for a query that has led to this one; in particular, - xdm dropped (won't log in root and there are no users yet); - network is brought up and configured via DHCP by default; - apt-get works out-of-box; - default image size is twice the chroot size.	2012-09-03 19:16:50 +03:00
Michael Shigorin	0e8871e7b4	use un-def kernel by default 3.5.2-std-def-alt2 brings boot problems which were absent with 3.4.x-std-def and are absent with 3.5.x-un-def; seems like it's better to stay with known good variant at the moment instead of having to fall back to it.	2012-09-03 19:16:50 +03:00
Michael Shigorin	e064954e93	rescue += ipmitool It was missing indeed; suggested by ildar@.	2012-09-03 19:16:50 +03:00
Michael Shigorin	83fa2544bc	fix root directory permissions hsh-initroot leaves the chroot's root directory permissions as 1775 while these should really be 755 at most; let's fix it (important for both VE and VM images, useful for rescue/livecd ones as well -- especially those with an installer onboard).	2012-09-03 19:16:50 +03:00
Michael Shigorin	d0cb988897	desktop+live += su Thanks aen@ for finally mentioning it as I just used to cope without su. :)	2012-09-03 19:16:50 +03:00
Michael Shigorin	84591991cb	no more silent aliases The missing "; @:" at the end of the otherwise recipeless rule resulted in target graph being broken; I should have checked this when introducing these aliases (the intent was to reduce noise).	2012-09-03 19:16:50 +03:00
Michael Shigorin	d2581522d9	systemd += chkconfig It appears that chkconfig wasn't getting pulled in by now if not told so explicitly. Still in need.	2012-09-03 19:16:50 +03:00
Michael Shigorin	705a20938a	conf.d/test.mk: live-mate-systemd Not even alpha quality yet but at least debuggable: - X session doesn't autostart but service dm start works; - keyboard layout indicator is missing until started by hand.	2012-09-03 19:16:50 +03:00
Michael Shigorin	f54a5660d1	MATE: current crop of packages There's a bunch of additions to the MATE package list: thanks viy@ for pulling extras into autoimports, several more tweaks done due to hints by dek@, and openssh packages added for debugging convenience. The kernel's been changed for the latest one (un-def).	2012-09-03 19:16:50 +03:00
Michael Shigorin	e0a849e974	initial live-gns3 Someone over the internets suggested that such a LiveCD exist: http://www.opennet.ru/openforum/vsluhforumID3/85817.html#24 ...but then disappeared in the thin air, sigh.	2012-09-03 19:15:42 +03:00
Michael Shigorin	b5e5d4f223	gear-store-tags	2012-08-13 22:04:57 +03:00