0.6.1-alt1

- ISO9660 metadata support - initial alien VE image
slimmer webkiosk with Russian layout
2012-03-26 23:23:30 +03:00 · 2012-03-26 23:17:41 +03:00 · 2012-03-26 22:40:40 +03:00 · 2012-03-26 22:23:28 +03:00 · 2012-03-25 21:46:45 +03:00 · 2012-03-21 15:55:24 +02:00
24 changed files with 94 additions and 30 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.0
+Version: 0.6.1
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -39,7 +39,7 @@ Virtual environment template caches (OpenVZ/LXC) can be made either.
 In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
  cd %mpdir
  head README
-  make distro/syslinux.iso
+  make syslinux.iso

 But if you're into regular distro hacking and are not afraid of make
 and modest metaprogramming (some code generation and introspection),
@@ -61,6 +61,10 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Mar 26 2012 Michael Shigorin <mike@altlinux.org> 0.6.1-alt1
+- ISO9660 metadata support
+- initial alien VE image
+
 * Mon Mar 19 2012 Michael Shigorin <mike@altlinux.org> 0.6.0-alt1
 - reports (targets graph)

--- a/.gear/tags/8cc85c046ab7ddd162f08001f1b615ee080ab7c4
+++ b/.gear/tags/8cc85c046ab7ddd162f08001f1b615ee080ab7c4
@@ -1,6 +0,0 @@
-object 3f85ed2b19708819aa28d23762f0d6b71741a483
-type commit
-tag v0.5.7
-tagger Michael Shigorin <mike@altlinux.org> 1331583347 +0200
-
-distro tweaks
--- a/.gear/tags/9f3938b732545a20e4acfd547c5a002fbca54b21
+++ b/.gear/tags/9f3938b732545a20e4acfd547c5a002fbca54b21
@@ -0,0 +1,6 @@
+object 1b7ce25f10d8e3faede66d8c66d3f3bb43f59ceb
+type commit
+tag v0.6.0
+tagger Michael Shigorin <mike@altlinux.org> 1332177960 +0200
+
+reports/targets
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-8cc85c046ab7ddd162f08001f1b615ee080ab7c4 v0.5.7
+9f3938b732545a20e4acfd547c5a002fbca54b21 v0.6.0
--- a/conf.d/alien.mk
+++ b/conf.d/alien.mk
@@ -0,0 +1,6 @@
+ve/.centos-base: ve/.bare
+	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
+
+ve/centos: ve/.centos-base
+	@$(call add,BASE_PACKAGES,openssh-server)
+
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -1,17 +1,14 @@
 # desktop distributions
 ifeq (distro,$(IMAGE_CLASS))

-distro/.desktop-base: distro/.installer \
-	use/syslinux/ui-vesamenu use/x11/xorg
+distro/.desktop-base: distro/.installer use/syslinux/ui-vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)

-distro/.desktop-mini: distro/.desktop-base \
-	use/lowmem use/x11/xdm use/power/acpi/button \
-	use/cleanup/alterator; @:
+distro/.desktop-mini: distro/.desktop-base use/lowmem use/x11/xdm \
+	use/power/acpi/button use/cleanup/alterator; @:

 distro/tde: distro/.desktop-mini +tde
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && network))
+	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))

 distro/icewm: distro/.desktop-mini +icewm; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -34,8 +34,10 @@ distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || extra) && (archive || rescue || network)))

-distro/live-webkiosk: distro/.live-desktop use/live/autologin use/live/hooks
+distro/live-webkiosk: distro/.live-desktop use/live/autologin \
+	use/live/hooks use/live/ru use/cleanup
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
+	@$(call add,CLEANUP_PACKAGES,'installer*' 'alterator*' 'libqt4*')

 endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -14,7 +14,7 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator

 distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:

-distro/server-ovz: distro/server-mini \
+distro/server-ovz: distro/server-mini use/install2/net \
 	use/hdt use/rescue use/firmware/server use/power/acpi/button
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
@@ -22,7 +22,6 @@ distro/server-ovz: distro/server-mini \
 	@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
-	@$(call add,INSTALL2_PACKAGES,curl)	### should become curl-mini
 	@$(call add,BASE_LISTS,ovz-server)
 	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
--- a/features.in/build-distro/README
+++ b/features.in/build-distro/README
@@ -1,4 +1,5 @@
 Эта фича конфигурирует создание образа дистрибутива, включая работу
 с субпрофилями -- которая сейчас нужна только дистрибутивным целям.

-Дополняет финальную стадию сборки (lib/, scripts.d/).
+Дополняет финальную стадию сборки (lib/, scripts.d/)
+и тесно с ней связана.
--- a/features.in/build-distro/lib/build-distro.mk
+++ b/features.in/build-distro/lib/build-distro.mk
@@ -4,7 +4,17 @@
 # take the latter part
 SUBDIRS = $(notdir $(SUBPROFILES))

-BOOT_TYPE = isolinux
+# proxy over the ISO metadata collected; see also genisoimagerc(5)
+BOOT_SYSI := $(META_SYSTEM_ID)
+BOOT_PUBL := $(META_PUBLISHER)
+BOOT_PREP := $(META_PREPARER)
+BOOT_APPI := $(META_APP_ID)
+BOOT_VOLI := $(META_VOL_ID)
+BOOT_VOLS := $(META_VOL_SET)
+BOOT_BIBL := $(META_BIBLIO)
+BOOT_ABST := $(META_ABSTRACT)
+
+BOOT_TYPE := isolinux

 # Metadata/ needed only for installers (and not for e.g. syslinux.iso)
 # FIXME: installable live needs it too, don't move to install2 feature
--- a/features.in/build-ve/README
+++ b/features.in/build-ve/README
@@ -1,3 +1,4 @@
 Эта фича конфигурирует создание образа виртуального окружения (VE).

-Дополняет финальную стадию сборки (lib/, image-scripts.d/).
+Дополняет финальную стадию сборки (lib/, image-scripts.d/)
+и тесно с ней связана.
--- a/features.in/build-ve/image-scripts.d/07fstab
+++ b/features.in/build-ve/image-scripts.d/07fstab
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -s /etc/fstab ] || cat >> /etc/fstab <<-EOF
+proc /proc proc nosuid,noexec,gid=proc 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
+EOF
--- a/features.in/cleanup/live/image-scripts.d/80locales
+++ b/features.in/cleanup/live/image-scripts.d/80locales
@@ -0,0 +1,11 @@
+#!/bin/sh
+# FIXME: there should be less brutal i18n tuning
+
+cd /usr/share/locale
+for i in */; do
+	case "$i" in
+	be*|en*|ru*|uk*) continue;;
+	esac
+	rm -r "$i"
+done
+:
--- a/features.in/cleanup/live/image-scripts.d/90cleanup-pkgs
+++ b/features.in/cleanup/live/image-scripts.d/90cleanup-pkgs
@@ -0,0 +1,6 @@
+#!/bin/sh -efu
+# remove extra packages from a bare livecd
+
+list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
+[ -z "$list" ] || apt-get remove -f -y -- $list
+:
--- a/features.in/cleanup/live/image-scripts.d/99cleanupdb
+++ b/features.in/cleanup/live/image-scripts.d/99cleanupdb
@@ -0,0 +1,3 @@
+#!/bin/sh
+# remove rpm, apt databases and cache
+find /var/lib/rpm /var/lib/apt /var/cache/apt -type f -delete
--- a/features.in/dos/config.mk
+++ b/features.in/dos/config.mk
@@ -1,5 +1,9 @@
+# tries to fill in ISO metadata in case it's the only inhabitant
 use/dos: use/syslinux
 	@$(call add_feature)
 	@$(call add,SYSLINUX_CFG,dos)
 	@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/memdisk)
 	@$(call add,STAGE1_PACKAGES,make-freedos-floppy glibc-gconv-modules)
+	@$(call try,META_SYSTEM_ID,DOS)
+	@$(call try,META_VOL_ID,FreeDOS 2.88M)
+	@$(call try,META_VOL_SET,FreeDOS)
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -4,3 +4,7 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
+
+### FR: curl-mini
+use/install2/net: use/install2
+	@$(call add,INSTALL2_PACKAGES,curl)
--- a/features.in/install2/install2/image-scripts.d/99cleanupdb
+++ b/features.in/install2/install2/image-scripts.d/99cleanupdb
@@ -1,6 +1,3 @@
-# remove rpm database
-rm -rf /var/lib/rpm/*
-
-# remove apt data files
-rm -rf /var/cache/apt /var/lib*/apt
-
+#!/bin/sh
+# remove rpm, apt databases and cache
+find /var/lib/rpm /var/lib/apt /var/cache/apt -type f -delete
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -20,3 +20,6 @@ use/live/autologin: use/live/desktop

 use/live/hooks: use/live
 	@$(call add,LIVE_PACKAGES,livecd-run-hooks)
+
+use/live/ru: use/live
+	@$(call add,LIVE_PACKAGES,livecd-ru)
--- a/features.in/syslinux/config.mk
+++ b/features.in/syslinux/config.mk
@@ -2,6 +2,7 @@
 use/syslinux: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,syslinux)
+	@$(call try,META_SYSTEM_ID,SYSLINUX)

 # UI is overwritten
 use/syslinux/ui-%: use/syslinux
--- a/image.in/vars.mk
+++ b/image.in/vars.mk
@@ -10,7 +10,7 @@ PREFS := $(.VARIABLES)
 DISTCFG := $(.VARIABLES)

 # a separator variable
-- := --
+-- = --

 .PHONY: dump-vars

--- a/lib/distro.mk
+++ b/lib/distro.mk
@@ -16,12 +16,18 @@ boot/%:

 # fundamental targets

-distro/.init: profile/bare; @:
+distro/.init: profile/bare
+	@$(call try,META_PREPARER,mkimage-profiles)
+	@$(call try,META_APP_ID,$(IMAGE_NAME))
+	@$(call set,META_PUBLISHER,ALT Linux Team)

 # NB: the last flavour in KFLAVOURS gets to be the default one;
 # the kernel packages regexp evaluation has to take place at build stage
 distro/.base: distro/.init
 	@$(call set,KFLAVOURS,std-def)
+	@$(call set,META_SYSTEM_ID,LINUX)
+	@$(call set,META_VOL_ID,ALT Linux $(ARCH))
+	@$(call set,META_VOL_SET,ALT Linux)

 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
--- a/lib/ve.mk
+++ b/lib/ve.mk
@@ -13,6 +13,7 @@ ve/bare: ve/.bare
 	@$(call add,BASE_PACKAGES,apt)

 ve/generic: ve/.bare
+	@$(call add,BASE_PACKAGES,openssh-server openssh-blacklist openssh-clients)
 	@$(call add,BASE_LISTS,\
 		$(call tags,base && (server || network || security || pkg)))

--- a/pkg.in/lists/tagged/server+network
+++ b/pkg.in/lists/tagged/server+network
@@ -9,6 +9,8 @@ mailx
 netcat
 netlist
 openssh-clients
+openssh-server
+openssh-blacklist
 rsync
 traceroute
 vlan-utils
Author	SHA1	Message	Date
Michael Shigorin	edfdeca311	0.6.1-alt1 - ISO9660 metadata support - initial alien VE image	2012-03-26 23:23:30 +03:00
Michael Shigorin	b6e640bd8d	slimmer webkiosk with Russian layout Thanks someone for review and feedback: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 Better cleanup and i18n controls are due but in the meantime, let's at least build something actually useful.	2012-03-26 23:17:41 +03:00
Michael Shigorin	0c41e39ec0	initial alien image support "Alien" rather means "CentOS-based" than "xenophilic" here; in case you still wonder: http://www.altlinux.org/Hasher/CentOS	2012-03-26 22:40:40 +03:00
Michael Shigorin	ed7bf0db9f	initial ISO9660 metadata support As was noted by Alexey Shabalin in libosinfo context, current ALT Linux images tend to lack ISO9660 metadata -- which they did have back in the day of Master 2.4. Please note that the data collection occurs this way due to mkimage's config.mk resetting the values to be empty; this was worked around by using another config file, $(BUILDDIR)lib/iso.mk, and including it later but that would require a separate target with per-target CONFIG variable which isn't elegant at all given the need to actually build up the metadata set. So the variables were changed (to be more readable anyways) and then proxied back to BOOT_*. This might be cleaned up some day after the inclusion order is tweaked or mkimage defaults get set-if-unset-yet (?=).	2012-03-26 22:23:28 +03:00
Michael Shigorin	17bd880e19	ve/generic += openssh suite openssh-server is in need indeed on almost any server instance; thanks Aleksey Cheusov for reporting the shortage. This might be amended in the future but is reasonable right now.	2012-03-25 21:46:45 +03:00
Michael Shigorin	80090d1f1a	minor tweaks (no functional changes) Mostly multiline compactions, but also use/install2/net got factored out from distro/server-ovz for future reuse.	2012-03-21 15:55:24 +02:00
Michael Shigorin	7ffd600076	gear-store-tags	2012-03-19 19:26:10 +02:00