Mailinglist Archive: opensuse-commit (1421 mails)
| < Previous | Next > |
commit kiwi-image-livecd-kde
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 16 May 2008 14:28:23 +0200
- Message-id: <20080516122823.EBDAD67816D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kiwi-image-livecd-kde
checked in at Fri May 16 14:28:23 CEST 2008.
--------
--- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes
2008-05-14 07:34:52.000000000 +0200
+++
/mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes
2008-05-16 14:28:02.920986000 +0200
@@ -1,0 +2,10 @@
+Thu May 15 21:20:27 CEST 2008 - coolo@xxxxxxx
+
+- update softlocks (bnc#390796)
+
+-------------------------------------------------------------------
+Thu May 15 17:58:12 CEST 2008 - coolo@xxxxxxx
+
+- build the USB stick again
+
+-------------------------------------------------------------------
kiwi-image-livecd-kde.changes: same change
New:
----
config.oempartition
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-image-livecd-gnome.spec ++++++
--- /var/tmp/diff_new_pack.f27712/_old 2008-05-16 14:28:11.000000000 +0200
+++ /var/tmp/diff_new_pack.f27712/_new 2008-05-16 14:28:11.000000000 +0200
@@ -28,7 +28,7 @@
BuildRequires: ghostscript-fonts-std ghostscript-library
Summary: GNOME Live CD
Version: 11.0
-Release: 92
+Release: 95
Group: Productivity/Other
License: BSD 3-Clause
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,6 +45,7 @@
Source11: configure-x.sh
Source12: correct_live_install
Source13: SoftLocks
+Source14: config.oempartition
Source15: openSUSE-release.prod
ExcludeArch: ia64 ppc64 s390x s390 ppc
# do not compress the ISO - takes ages
@@ -73,7 +74,12 @@
mkdir config
cd config
install -m 755 %{SOURCE3} config.sh
-(sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack;
do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p'
%{SOURCE4} ) | xmllint --format - > config.xml
+(sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack;
do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p'
%{SOURCE4} ) | \
+ xmllint --format - > config.xml
+cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem
+install -m 644 %{SOURCE14} myoem/root/config.oempartition
+kiwi --createhash myoem
+sed -i -e 's,@OEM@,%{_builddir}/%{name}-%{version}/config/myoem,' config.xml
mkdir config-cdroot
cd config-cdroot
# I know this looks weird in the kde.spec, but GNOME is replaced with GNOME to
generate gnome.spec
@@ -126,13 +132,14 @@
rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep
-v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list
diff -u wanted.list installed.list
kiwi --logfile terminal --create $PWD/tmp -d $PWD/out
-#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem
+kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem
umount -f tmp/base-system/home/rpmdir || true
%install
mkdir -p %{buildroot}/usr/share/kiwi/output
mkdir -p %{buildroot}/usr/share/openSUSE/
cp -a config %{buildroot}/usr/share/openSUSE/kiwi-config-gnome
+sed -i -e
's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-gnome,'
%{buildroot}/usr/share/openSUSE/kiwi-config-kde/config.xml
install -m 644 -D %{SOURCE1}
%{buildroot}/%_docdir/kiwi-config-openSUSE-gnome/COPYING
cd out
file=`ls -1 *.iso`
@@ -142,8 +149,8 @@
exit 1
fi
mv $file %{buildroot}/usr/share/kiwi/output/%name-$file
-#file=`ls -1 *.raw`
-#lzma -v -2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.lzma
+file=`ls -1 *.raw`
+bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2
%files
%defattr(-, root, root)
@@ -154,6 +161,10 @@
/usr/share/openSUSE
%changelog
+* Thu May 15 2008 coolo@xxxxxxx
+- update softlocks (bnc#390796)
+* Thu May 15 2008 coolo@xxxxxxx
+- build the USB stick again
* Wed May 14 2008 coolo@xxxxxxx
- use sax2 again - too many problems not understood
* Tue May 13 2008 coolo@xxxxxxx
++++++ kiwi-image-livecd-kde.spec ++++++
--- /var/tmp/diff_new_pack.f27712/_old 2008-05-16 14:28:11.000000000 +0200
+++ /var/tmp/diff_new_pack.f27712/_new 2008-05-16 14:28:11.000000000 +0200
@@ -28,7 +28,7 @@
BuildRequires: ghostscript-fonts-std ghostscript-library
Summary: KDE live CD
Version: 11.0
-Release: 92
+Release: 95
Group: System/Boot
License: BSD 3-Clause
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,6 +45,7 @@
Source11: configure-x.sh
Source12: correct_live_install
Source13: SoftLocks
+Source14: config.oempartition
Source15: openSUSE-release.prod
ExcludeArch: ia64 ppc64 s390x s390 ppc
# do not compress the ISO - takes ages
@@ -73,7 +74,12 @@
mkdir config
cd config
install -m 755 %{SOURCE3} config.sh
-(sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack;
do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p'
%{SOURCE4} ) | xmllint --format - > config.xml
+(sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack;
do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p'
%{SOURCE4} ) | \
+ xmllint --format - > config.xml
+cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem
+install -m 644 %{SOURCE14} myoem/root/config.oempartition
+kiwi --createhash myoem
+sed -i -e 's,@OEM@,%{_builddir}/%{name}-%{version}/config/myoem,' config.xml
mkdir config-cdroot
cd config-cdroot
# I know this looks weird in the kde.spec, but KDE is replaced with GNOME to
generate gnome.spec
@@ -126,13 +132,14 @@
rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep
-v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list
diff -u wanted.list installed.list
kiwi --logfile terminal --create $PWD/tmp -d $PWD/out
-#kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem
+kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem
umount -f tmp/base-system/home/rpmdir || true
%install
mkdir -p %{buildroot}/usr/share/kiwi/output
mkdir -p %{buildroot}/usr/share/openSUSE/
cp -a config %{buildroot}/usr/share/openSUSE/kiwi-config-kde
+sed -i -e
's,%{_builddir}/%{name}-%{version}/config,/usr/share/openSUSE/kiwi-config-kde,'
%{buildroot}/usr/share/openSUSE/kiwi-config-kde/config.xml
install -m 644 -D %{SOURCE1}
%{buildroot}/%_docdir/kiwi-config-openSUSE-kde/COPYING
cd out
file=`ls -1 *.iso`
@@ -142,8 +149,8 @@
exit 1
fi
mv $file %{buildroot}/usr/share/kiwi/output/%name-$file
-#file=`ls -1 *.raw`
-#lzma -v -2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.lzma
+file=`ls -1 *.raw`
+bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2
%files
%defattr(-, root, root)
@@ -154,6 +161,10 @@
/usr/share/openSUSE
%changelog
+* Thu May 15 2008 coolo@xxxxxxx
+- update softlocks (bnc#390796)
+* Thu May 15 2008 coolo@xxxxxxx
+- build the USB stick again
* Wed May 14 2008 coolo@xxxxxxx
- use sax2 again - too many problems not understood
* Tue May 13 2008 coolo@xxxxxxx
++++++ config.xml.in ++++++
--- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-05-12
14:09:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in
2008-05-15 16:12:10.355504000 +0200
@@ -9,9 +9,9 @@
<type primary="true" boot="isoboot/suse-11.0" flags="unified">iso</type>
<type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type>
<type boot="xenboot/suse-11.0" filesystem="ext3">xen</type>
- <type boot="oemboot/suse-11.0" filesystem="ext3" flags="unified">oem</type>
+ <type boot="@OEM@" filesystem="squashfs" flags="unified">oem</type>
<version>2.6.1</version>
- <size unit="M">2000</size>
+ <size unit="M">780</size>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>False</rpm-check-signatures>
<rpm-force>False</rpm-force>
++++++ SoftLocks ++++++
--- arch/i686/kiwi-image-livecd-kde/SoftLocks 2008-04-30 21:05:03.000000000
+0200
+++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/SoftLocks
2008-05-15 21:19:15.183037000 +0200
@@ -1,52 +1,61 @@
-words
-oxygen-icon-theme-scalable
-kdegames4-carddecks-other
-OpenOffice_org-thesaurus-en
-OpenOffice_org-templates-presentation-layouts
-OpenOffice_org-templates-en
-OpenOffice_org-hyphen
-vim-data
-readline-doc
-rdesktop
-perl-doc
-libgcj43-jar
-libgcj43
-java-1_5_0-gcj-compat
-ispell-american
-ispell
-hpijs-standalone
-gtk2-branding-upstream
-ghostscript-fonts-other
+alsa-plugins
+digikamimageplugins-superimpose
+enscript
+ft2demos
gcc43-gij
gcc-gij
-ft2demos
-enscript
-digikamimageplugins-superimpose
-alsa-plugins
-OpenOffice_org-pyuno
-OpenOffice_org-math
-OpenOffice_org-mailmerge
-OpenOffice_org-filters
-OpenOffice_org-base
-java-1_5_0-sun
-sane-backends-autoconfig
-sane-backends
-libieee1284
+ghostscript-fonts-other
+gnome2-user-docs
+gtk2-branding-upstream
+hpijs-standalone
hplip-hpijs
+ispell
+ispell-american
+java-1_5_0-gcj-compat
+java-1_5_0-sun
java-1_6_0-sun
-opensuse-manual_en
-gnome2-user-docs
-opensuse-gnomeuser_en
-pacemaker
-opensuse-manual_de
-myspell-german
-man-pages-de
-kde4-l10n-de-doc
-kde4-l10n-de-data
-kde3-i18n-de-doc
kde3-i18n-de-data
-OpenOffice_org-thesaurus-de
-OpenOffice_org-templates-de
-OpenOffice_org-de
+kde3-i18n-de-doc
+kde4-l10n-de-data
+kde4-l10n-de-doc
+kdegames4-carddecks-other
+libgcj43
+libgcj43-jar
+libieee1284
+man-pages-de
MozillaFirefox-translations
-
+myspell-german
+OpenOffice_org-base
+OpenOffice_org-de
+OpenOffice_org-filters
+OpenOffice_org-hyphen
+OpenOffice_org-mailmerge
+OpenOffice_org-math
+OpenOffice_org-pyuno
+OpenOffice_org-templates-de
+OpenOffice_org-templates-en
+OpenOffice_org-templates-presentation-layouts
+OpenOffice_org-thesaurus-de
+OpenOffice_org-thesaurus-en
+opensuse-gnomeuser_en
+opensuse-manual_de
+opensuse-manual_en
+oxygen-icon-theme-scalable
+pacemaker
+perl-Digest-HMAC
+perl-doc
+perl-IO-Socket-SSL
+perl-Net-DNS
+perl-Net-IP
+perl-Net_SSLeay
+perl-spamassassin
+rdesktop
+readline-doc
+sane-backends
+sane-backends-autoconfig
+spamassassin
+vim-data
+virtualbox-ose-guest-tools
+virtualbox-ose-kmp-default
+vmware-kmp-default
+words
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |