0.8.5-alt1

- diffable logs - AMD APU support
desktop+tde -= gtk2-themes-qtcurve
2012-10-29 22:07:50 +02:00 · 2012-10-27 22:28:17 +03:00 · 2012-10-27 22:27:22 +03:00 · 2012-10-27 22:21:00 +03:00 · 2012-10-27 22:20:44 +03:00 · 2012-10-27 22:19:15 +03:00
14 changed files with 53 additions and 15 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.3
+Version: 0.8.5
 Release: alt1

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

 %changelog
+* Mon Oct 29 2012 Michael Shigorin <mike@altlinux.org> 0.8.5-alt1
+- diffable logs
+- AMD APU support
+
+* Tue Oct 16 2012 Michael Shigorin <mike@altlinux.org> 0.8.4-alt1
+- worked around enhancements in current make-initrd-propagator
+  (thus fixed live image boot, finally)
+
 * Mon Oct 15 2012 Michael Shigorin <mike@altlinux.org> 0.8.3-alt1
 - make-3.82 support
 - fixed live image boot to some extent (see #27640, #27852)
--- a/.gear/tags/1e5c009892977dc5c625bdac348a171fb5b8ca23
+++ b/.gear/tags/1e5c009892977dc5c625bdac348a171fb5b8ca23
@@ -0,0 +1,6 @@
+object 939455e7a3df68563df75545adf8ffd1adde6802
+type commit
+tag v0.8.4
+tagger Michael Shigorin <mike@altlinux.org> 1350379178 +0300
+
+make-initrd-propagator-0.10+
--- a/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
+++ b/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
@@ -1,6 +0,0 @@
-object b44705d25baf5b0f0c0abb526d42c42b312026e9
-type commit
-tag v0.8.2
-tagger Michael Shigorin <mike@altlinux.org> 1348509116 +0400
-
-propagator joy
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-8e161378cc7ad174898a8d51697730334b1b712a v0.8.2
+1e5c009892977dc5c625bdac348a171fb5b8ca23 v0.8.4
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -11,8 +11,10 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

+distro/tde: distro/.desktop-mini +tde
+	@$(call set,KFLAVOURS,led-ws)
+
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
-distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -40,6 +40,7 @@ distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
+	@$(call set,KFLAVOURS,led-ws)

 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -10,7 +10,7 @@ use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))

 # a very simplistic one
-use/live/x11: use/live use/x11/xorg
+use/live/x11: use/live use/firmware use/x11/xorg
 	@$(call add,LIVE_PACKAGES,xinit)

 # optimized out: use/x11/xorg
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -1,7 +1,7 @@
 # "1" is not a typo
 use/stage2: sub/stage1
 	@$(call add_feature)
-	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator)
+	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)

 use/stage2/kms:
 	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
--- a/lib/distro.mk
+++ b/lib/distro.mk
@@ -31,7 +31,7 @@ distro/.base: distro/.init use/kernel
 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
 distro/installer: distro/.base use/syslinux/localboot.cfg \
-	use/install2 use/install2/kms use/install2/kvm
+	use/install2 use/install2/kms use/firmware use/install2/kvm
 	@$(call set,INSTALLER,altlinux-generic)

 distro/.installer: distro/installer use/bootloader/grub use/repo/main; @:
--- a/pkg.in/lists/tagged/desktop+network+live
+++ b/pkg.in/lists/tagged/desktop+network+live
@@ -0,0 +1 @@
+livecd-firefox
--- a/pkg.in/lists/tagged/desktop+razorqt
+++ b/pkg.in/lists/tagged/desktop+razorqt
@@ -1,4 +1,4 @@
-razor-qt
+razorqt
 arora
 qtfm
 qterminal
--- a/pkg.in/lists/tagged/desktop+tde
+++ b/pkg.in/lists/tagged/desktop+tde
@@ -7,7 +7,7 @@ kdegraphics-ksnapshot
 kdegraphics-kview
 kdeutils-laptop
 kdepim-akregator
-gtk2-themes-qtcurve
+#gtk2-themes-qtcurve
 #kde-styles-qtcurve
 kdeutils-ark
 #kdebluetooth
--- a/pkg.in/lists/xorg
+++ b/pkg.in/lists/xorg
@@ -6,6 +6,7 @@ xorg-drv-fbdev
 xorg-drv-intel
 xorg-drv-joystick
 xorg-drv-mga
+xorg-drv-modesetting
 xorg-drv-multimedia
 xorg-drv-nouveau
 xorg-drv-nv
--- a/reports.mk
+++ b/reports.mk
@@ -17,7 +17,7 @@ ifneq (1,$(NUM_TARGETS))
 SHORTEN := >/dev/null
 endif

-all: reports/targets reports/scripts
+all: reports/targets reports/scripts reports/cleanlog
 	@if [ -n "$(IMAGE_OUTPATH)" ]; then \
 		cp -a "$(REPORTDIR)" "$(LOGDIR)/$(IMAGE_OUTFILE).reports"; \
 	fi
@@ -25,6 +25,31 @@ all: reports/targets reports/scripts
 reports/prep:
 	@mkdir -p "$(REPORTDIR)"

+# try to drop common noise rendering diff(1) mostly useless
+reports/cleanlog: reports/prep
+	@OUT="$(REPORTDIR)/$(@F).log"; \
+	sed -r \
+		-e 's,$(BUILDDIR),,g' \
+		-e '/\/var\/lib\/apt\/lists/d' \
+		-e 's/... .. ..:..:..//g' \
+		-e 's/\[[0-9]+\]//g' \
+		-e '/^(Reading Package Lists|Building Dependency Tree)/d' \
+		-e '/^(Fetched|Need to get|After unpacking) /d' \
+		-e '/^(Preparing packages for installation|Done\.)/d' \
+		-e '/^hsh(|-(initroot|install|fakedev|(mk|rm)chroot|run)): /d' \
+		-e '/^(hasher-priv|mkaptbox|(mk|rm)dir): /d' \
+		-e '/^mki-((invalidate-|)cache|check-obsolete|prepare): /d' \
+		-e '/^(mode of|changed (group|ownership)|removed) /d' \
+		-e '/^chroot\/.in\//d' \
+		-e '/ has started executing\.$$/d' \
+		-e '/\/var\/log\/apt\.log$$/d' \
+		-e '/\/usr\/share\/apt\/scripts\/log\.lua/d' \
+		-e '/\.rpm$$/d' \
+		-e "/' -> '/d" \
+		< $(BUILDLOG) \
+		> "$(REPORTDIR)/$(@F).log" \
+	&& echo "** diffable log: $$OUT" $(SHORTEN)
+
 reports/scripts: reports/prep
 	@OUT="$(REPORTDIR)/$(@F).log"; \
 	grep "^mki.*scripts: Run: " $(BUILDLOG) \
Author	SHA1	Message	Date
Michael Shigorin	91a4cc986f	0.8.5-alt1 - diffable logs - AMD APU support	2012-10-29 22:07:50 +02:00
Michael Shigorin	32719b3145	desktop+tde -= gtk2-themes-qtcurve There's no gtk2-themes-qtcurve package in Sisyphus at the moment; let's fix image build until it's back again (if it ever is).	2012-10-27 22:28:17 +03:00
Michael Shigorin	02791834f9	distro/installer, use/live/x11 += use/firmware This is thanks to the fact that alterator-based install2 needs alterator-browser-qt which needs X11 which needs working device drivers -- and at least AMD C60 APU would only yield a nice dotted white screen without that firmware. Roughly the same for X11 bearing LiveCD images.	2012-10-27 22:27:22 +03:00
Michael Shigorin	63b515c922	live-webkiosk-mini, tde: use led-ws kernel flavour The rationale for the former is that the image gets slightly more compact (although the current sisyphus build is way larger than the t6/branch build of the optimization time, need to look into that...); and for the latter it's to provide yet another installer with a different enough kernel so that there's one more chance in a weird situation.	2012-10-27 22:21:00 +03:00
Michael Shigorin	d445f5e374	xorg: added xorg-drv-modesetting Thanks boyarsh@ for a hint that VM-emulated cirrus VGA actually requires xorg-drv-modesetting when used with recent kernels.	2012-10-27 22:20:44 +03:00
Michael Shigorin	0e39602368	initial desktop+network+live Actually just a split of livecd-webkiosk into the kiosk related part and generic livecd firefox setup (turning off queries that are pretty useless in that environment).	2012-10-27 22:19:15 +03:00
Michael Shigorin	f4d4544832	razorqt-0.5 support Yet another rename, sigh. The release is worth the trouble though.	2012-10-27 22:18:36 +03:00
Michael Shigorin	aa8699c4a4	reports.mk: diffable logs This is a mild generalization of what has been done by hand to figure out a problem with make-initrd-propagator-0.10-alt1: stripping anything intrinsically volatile off the build.log. The filter set isn't perfect, and the proper logging will involve mkimage tweaks as well (e.g., one generally isn't interested in instrumental chroots' population that much, so it should only be verbose at the higher debug levels).	2012-10-27 22:13:58 +03:00
Michael Shigorin	8d96a102ae	gear-store-tags	2012-10-16 12:20:21 +03:00
Michael Shigorin	939455e7a3	0.8.4-alt1 - worked around enhancements in current make-initrd-propagator (thus fixed live image boot, finally)	2012-10-16 12:17:28 +03:00
Michael Shigorin	aaddfb740c	stage2: cope with current make-initrd-propagator The issue that appeared pretty hard to diagnose occured to be the enhancement made in make-initrd-propagator=0.8.1-alt1.2 (that didn't hit Sisyphus until merged into 0.10-alt1) which drops propagator dependency. And that was optimized out in m-p, of course.	2012-10-16 12:16:39 +03:00
Michael Shigorin	b8d711a005	gear-store-tags	2012-10-15 23:35:17 +03:00