1.0.4-alt0.M70T.1

- kernel: don't insist on k-m-r8168

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.0.2
+Version: 1.0.4
 Release: alt0.M70T.1
 
 Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,12 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* Mon Mar 17 2014 Michael Shigorin <mike@altlinux.org> 1.0.4-alt0.M70T.1
+- kernel: don't insist on k-m-r8168
+
+* Mon Mar 03 2014 Michael Shigorin <mike@altlinux.org> 1.0.3-alt0.M70T.1
+- vm fixes/backports
+
 * Mon Dec 23 2013 Michael Shigorin <mike@altlinux.org> 1.0.2-alt0.M70T.1
 - backported adaptations to handle EFI signed binaries the current way
 

.gear/tags/ccc5ff5be43f0e54ed18fa6f39bc97e72483b681

@@ -0,0 +1,6 @@
+object ee09a917e86302594b3611bdc196af8aa8121094
+type commit
+tag v1.0.3
+tagger Michael Shigorin <mike@altlinux.org> 1393863286 +0400
+
+vm fixes

.gear/tags/f13525a33f0d85a02deda42b7fd5f45c98dc2911

@@ -1,6 +0,0 @@
-object 3b2a0649bf39199b177979e143a3497ba7dff9c0
-type commit
-tag v1.0.1
-tagger Michael Shigorin <mike@altlinux.org> 1385399240 +0400
-
-THE_PACKAGES

.gear/tags/list

@@ -1 +1 @@
-f13525a33f0d85a02deda42b7fd5f45c98dc2911 v1.0.1
+ccc5ff5be43f0e54ed18fa6f39bc97e72483b681 v1.0.3

bin/tar2vm

@@ -38,9 +38,10 @@ DISKSIZEM="$(($DISKSIZE / 1048576))"
 # NB: xfs doesn't have a spare sector for the bootloader
 ROOTFSTYPE="${4:-ext4}"
 
-# single root partition hardwired so far,
+# SCSI case hardwired so far;
-# add another image for swap if needed
+# use virtio_scsi setup if performance is critical
-ROOTDEV="/dev/sda1"
+# *and* updating the image is going to occur
+BOOTDEV="/dev/sda"
 
 # last preparations...
 for i in losetup sfdisk parted kpartx mkfs."$ROOTFSTYPE"; do
@@ -78,20 +79,29 @@ losetup "$LOOPDEV" "$IMG"
 parted --script "$LOOPDEV" mklabel msdos
 parted --script "$LOOPDEV" mkpart primary ext2 1 "$DISKSIZEM"
 
-kpartx -a "$LOOPDEV"
+kpartx -a -s "$LOOPDEV"
 LOOPDEV1="/dev/mapper/$(basename "$LOOPDEV")p1"
 
 mkfs."$ROOTFSTYPE" "$LOOPDEV1"
 
+ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPDEV1")"
+if [ -n "$ROOTUUID" ]; then
+	ROOTDEV="UUID=$ROOTUUID"
+else
+	ROOTDEV="${BOOTDEV}1"
+fi
+
 # mount and populate it
 mkdir -pm755 "$ROOTFS"
 mount "$LOOPDEV1" "$ROOTFS"
 tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
 for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
 
-# NB: different storage modules might be needed for non-kvm
+# NB: different storage modules might be needed for different VMs
+VIRTIO_MODULES="virtio_pci virtio_blk virtio_scsi"
 echo "$LOOPDEV1 / $ROOTFSTYPE defaults 1 1" >> "$ROOTFS/etc/fstab"
-echo "MODULES_PRELOAD=sd_mod ata_piix $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
+echo "MODULES_PRELOAD += sd_mod ata_piix $VIRTIO_MODULES $ROOTFSTYPE" \
+	>> "$ROOTFS/etc/initrd.mk"
 
 KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
 chroot "$ROOTFS" make-initrd -k "$KERNEL"
@@ -125,7 +135,7 @@ EOF
 chroot "$ROOTFS" lilo -C /etc/lilo-loop.conf
 
 cat > "$ROOTFS"/etc/lilo.conf << EOF
-boot=${ROOTDEV%[0-9]*}
+boot=$BOOTDEV
 $LILO_COMMON
 EOF
 

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; @:
@@ -18,3 +19,7 @@ distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
 distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
 
 endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
+endif

conf.d/vm.mk

@@ -1,9 +1,10 @@
 # virtual machines
 ifeq (vm,$(IMAGE_CLASS))
 
-vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:
+vm/net: vm/bare use/vm-net/dhcp use/vm-ssh use/repo
+	@$(call set,VM_SIZE,5368709120)	# 5 Gb is enough for everyone
 
 # NB: use/x11 employs some installer-feature packages
-vm/icewm: vm/net use/cleanup/installer use/repo +icewm; @:
+vm/icewm: vm/net use/cleanup/installer +icewm; @:
 
 endif

features.in/kernel/config.mk

@@ -9,5 +9,7 @@ use/kernel:
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,std-def)
 
+# r8168 is a kludge, never install it by default
 use/kernel/net:
-	@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)
+	@$(call add,THE_KMODULES,e1000e igb)
+	@$(call add,MAIN_KMODULES,r8168 rtl8168)

lib/vm.mk

@@ -7,8 +7,10 @@ endif
 ifeq (vm,$(IMAGE_CLASS))
 
 vm/.bare: profile/bare
-	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
+	@$(call add,BASE_PACKAGES,sysklogd syslogd sysvinit interactivesystem)
-	@$(call set,KFLAVOURS,un-def)
+	@$(call add,BASE_PACKAGES,lilo shadow-utils e2fsprogs)
+	@$(call set,KFLAVOURS,led-ws)
+	@$(call add,BASE_KMODULES,guest)
 
 vm/bare: vm/.bare
 	@$(call add,BASE_PACKAGES,apt)

sub.in/stage1/modules

@@ -169,7 +169,7 @@ qlogicfas408.ko
 qlogicfas.ko
 qlogicfc.ko
 qlogicisp.ko
-r8168.ko
+r8169.ko
 raid_class.ko
 reiserfs.ko
 rrunner.ko