Hello community,
here is the log from the commit of package kiwi-image-livecd-kde
checked in at Wed Aug 13 15:09:21 CEST 2008.
--------
--- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 22:57:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-13 15:08:41.102308000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 13 09:08:48 CEST 2008 - coolo@suse.de
+
+- make the usb image work with factory (kiwi patch)
+- make the repos work
+- support minimal X11
+
+-------------------------------------------------------------------
kiwi-image-livecd-kde.changes: same change
New:
----
initrd-11.0.list
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-image-livecd-gnome.spec ++++++
--- /var/tmp/diff_new_pack.Zd8791/_old 2008-08-13 15:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Zd8791/_new 2008-08-13 15:09:13.000000000 +0200
@@ -25,7 +25,7 @@
BuildRequires: bundle-lang-common-en lzma pm-utils yast2-live-installer
BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang
BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD
-BuildRequires: opensuse-gnomequick_en-pdf yast2-firstboot
+BuildRequires: libxslt opensuse-gnomequick_en-pdf yast2-firstboot
# the following are listed as needed without a way for me to track it
# without solving and I have no idea how to do that automatically.
# simply remove them and try to build - kiwi/zypper will then complain
@@ -36,7 +36,7 @@
BuildRequires: ghostscript-fonts-std ghostscript-library
Summary: GNOME Live CD
Version: 11.1
-Release: 8
+Release: 9
Group: Productivity/Other
License: BSD 3-Clause
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +59,7 @@
Source18: kiwi-config.diff
Source19: config-usb.patch
Source20: geturls.xsl
+Source21: initrd-11.0.list
ExcludeArch: ia64 ppc64 s390x s390 ppc
%define build_usb 1
# do not compress the ISO - takes ages
@@ -94,8 +95,8 @@
suseversion=11.1
%endif
cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem
-cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso
-patch -p0 < %{SOURCE18}
+cp -rL /usr/share/kiwi/image/isoboot/suse-$suseversion myiso
+patch -l -p0 < %{SOURCE18}
# do not package it
rm -f myoem/config.xml.orig
rm -f myiso/config.xml.orig
@@ -118,7 +119,7 @@
mkdir rpmkeys
cp /CD1/gpg-pubkey* rpmkeys
install -m 644 -D /CD1/control.xml etc/YaST2/control.xml
-install -m 644 %{SOURCE20} tmp/geturls.xsl
+/usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh
install -m 644 %{SOURCE5} tmp/config.patch
mkdir -p etc/zypp/products.d
echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod
@@ -148,7 +149,11 @@
mkdir tmp out
rm -rf /home/rpmdir
mkdir -p /home/rpmdir/rpms
-for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 kiwi-tools checkmedia yast2-firstboot; do
+sourcelist=%{SOURCE21}
+%if %suse_version > 1100
+sourcelist=/usr/share/suse/packages/x11_cd-initrd.*.list
+%endif
+for i in `cat wanted.list $sourcelist | sort -u`; do
cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms
done
createrepo /home/rpmdir
@@ -189,7 +194,7 @@
mv $file %{buildroot}/usr/share/kiwi/output/%name-$file
%else
file=`ls -1 *.raw`
-bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2
+gzip -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.gz
%endif
%files
@@ -197,10 +202,15 @@
/usr/share/kiwi
%files -n kiwi-config-openSUSE-gnome
+%defattr(-, root, root)
%doc %_docdir/kiwi-config-openSUSE-gnome
/usr/share/openSUSE
%changelog
+* Wed Aug 13 2008 coolo@suse.de
+- make the usb image work with factory (kiwi patch)
+- make the repos work
+- support minimal X11
* Mon Aug 11 2008 coolo@suse.de
- don't use cracklib-dict-small
* Mon Aug 11 2008 coolo@suse.de
++++++ kiwi-image-livecd-kde.spec ++++++
--- /var/tmp/diff_new_pack.Zd8791/_old 2008-08-13 15:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Zd8791/_new 2008-08-13 15:09:13.000000000 +0200
@@ -25,7 +25,7 @@
BuildRequires: bundle-lang-common-en lzma pm-utils yast2-live-installer
BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang
BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD
-BuildRequires: opensuse-kdequick_en-pdf yast2-firstboot
+BuildRequires: libxslt opensuse-kdequick_en-pdf yast2-firstboot
# the following are listed as needed without a way for me to track it
# without solving and I have no idea how to do that automatically.
# simply remove them and try to build - kiwi/zypper will then complain
@@ -36,7 +36,7 @@
BuildRequires: ghostscript-fonts-std ghostscript-library
Summary: KDE live CD
Version: 11.1
-Release: 8
+Release: 9
Group: System/Boot
License: BSD 3-Clause
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +59,7 @@
Source18: kiwi-config.diff
Source19: config-usb.patch
Source20: geturls.xsl
+Source21: initrd-11.0.list
ExcludeArch: ia64 ppc64 s390x s390 ppc
%define build_usb 1
# do not compress the ISO - takes ages
@@ -94,8 +95,8 @@
suseversion=11.1
%endif
cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem
-cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso
-patch -p0 < %{SOURCE18}
+cp -rL /usr/share/kiwi/image/isoboot/suse-$suseversion myiso
+patch -l -p0 < %{SOURCE18}
# do not package it
rm -f myoem/config.xml.orig
rm -f myiso/config.xml.orig
@@ -118,7 +119,7 @@
mkdir rpmkeys
cp /CD1/gpg-pubkey* rpmkeys
install -m 644 -D /CD1/control.xml etc/YaST2/control.xml
-install -m 644 %{SOURCE20} tmp/geturls.xsl
+/usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh
install -m 644 %{SOURCE5} tmp/config.patch
mkdir -p etc/zypp/products.d
echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod
@@ -148,7 +149,11 @@
mkdir tmp out
rm -rf /home/rpmdir
mkdir -p /home/rpmdir/rpms
-for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 kiwi-tools checkmedia yast2-firstboot; do
+sourcelist=%{SOURCE21}
+%if %suse_version > 1100
+sourcelist=/usr/share/suse/packages/x11_cd-initrd.*.list
+%endif
+for i in `cat wanted.list $sourcelist | sort -u`; do
cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms
done
createrepo /home/rpmdir
@@ -189,7 +194,7 @@
mv $file %{buildroot}/usr/share/kiwi/output/%name-$file
%else
file=`ls -1 *.raw`
-bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2
+gzip -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.gz
%endif
%files
@@ -197,10 +202,15 @@
/usr/share/kiwi
%files -n kiwi-config-openSUSE-kde
+%defattr(-, root, root)
%doc %_docdir/kiwi-config-openSUSE-kde
/usr/share/openSUSE
%changelog
+* Wed Aug 13 2008 coolo@suse.de
+- make the usb image work with factory (kiwi patch)
+- make the repos work
+- support minimal X11
* Mon Aug 11 2008 coolo@suse.de
- don't use cracklib-dict-small
* Mon Aug 11 2008 coolo@suse.de
++++++ config.sh ++++++
--- arch/i686/kiwi-image-livecd-kde/config.sh 2008-08-08 14:46:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-08-12 17:51:31.592641000 +0200
@@ -14,6 +14,8 @@
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile
+set -e
+
exec > /var/log/config.log
exec 2>&1
@@ -55,12 +57,12 @@
rmdir /rpmkeys
insserv
-insserv -r boot.apparmor
+insserv -r boot.apparmor || true
rm -rf /var/cache/zypp/raw/*
-xsltproc /tmp/geturls.xsl /etc/YaST2/control.xml | bash -x
-rm /tmp/geturls.xsl
+bash -x /tmp/geturls.sh
+rm /tmp/geturls.sh
#======================================
# /etc/sudoers hack to fix #297695
@@ -90,9 +92,10 @@
test -x /usr/bin/kbuildsycoca4 && su - linux -c /usr/bin/kbuildsycoca4
+set +e
#======================================
# Umount kernel filesystems
#--------------------------------------
baseCleanMount
-
exit 0
+
++++++ config.xml.in ++++++
--- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-08-11 12:55:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-08-12 11:31:47.311030000 +0200
@@ -12,7 +12,7 @@
<!-- type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type -->
<type boot="@CONFIG@/myoem" filesystem="ext3">oem</type>
<version>2.7.0</version>
- <size unit="M">2780</size>
+ <size unit="M">1999</size>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>False</rpm-check-signatures>
<rpm-force>False</rpm-force>
++++++ geturls.xsl ++++++
--- arch/i686/kiwi-image-livecd-kde/geturls.xsl 2008-08-08 14:43:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/geturls.xsl 2008-08-12 17:42:15.401398000 +0200
@@ -4,9 +4,9 @@
participants (1)
-
root@Hilbert.suse.de