Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Fri May 2 12:11:52 CEST 2008. -------- --- arch/i386/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-04-30 00:08:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-05-02 12:11:36.523587000 +0200 @@ -1,0 +2,10 @@ +Fri May 2 07:56:31 CEST 2008 - coolo@suse.de + +- sign the repo (bnc#385488) + +------------------------------------------------------------------- +Wed Apr 30 18:23:15 CEST 2008 - coolo@suse.de + +- creating a product + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- zypp.product New: ---- content content-x86_64.diff gpg-pubkey-8BB1F40D.asc gpg-seckey-8BB1F40D.asc livecd_product_repo.repo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.S18895/_old 2008-05-02 12:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.S18895/_new 2008-05-02 12:11:44.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.0 -Release: 80 +Release: 82 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,9 +42,13 @@ Source8: ifcfg-eth0 Source9: langset.tgz Source10: create_xconf -Source11: zypp.product Source12: correct_live_install Source13: SoftLocks +Source14: livecd_product_repo.repo +Source15: content +Source16: content-x86_64.diff +Source17: gpg-pubkey-8BB1F40D.asc +Source18: gpg-seckey-8BB1F40D.asc ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -90,24 +94,38 @@ mkdir -p root/tmp cd root install -m 644 /CD1/license.tar.gz . -tar cvzf tmp/gpg-pubkey.tgz /CD1/gpg-pubkey* +mkdir rpmkeys +cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml +mkdir gpgkeys +install -m 644 %{SOURCE17} gpgkeys +install -m 644 %{SOURCE17} rpmkeys +install -m 644 %{SOURCE18} gpgkeys install -m 644 %{SOURCE5} tmp/config.patch -mkdir -p var/lib/zypp/db/products/ +mkdir -p var/lib/zypp/livecd_product # see above if test GNOME = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE11} > var/lib/zypp/db/products/aae0a680f12121130067466712844104 + sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > var/lib/zypp/livecd_product/content else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE11} > var/lib/zypp/db/products/aae0a680f12121130067466712844104 + sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE15} > var/lib/zypp/livecd_product/content fi +%ifarch x86_64 +patch var/lib/zypp/livecd_product/content %{SOURCE16} +%endif install -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch +install -D -m 644 %{SOURCE14} etc/zypp/repos.d/livecd_product_repo.repo +for i in var/lib/zypp/livecd_product/media.1/media \ + var/lib/zypp/livecd_product/suse/setup/descr/packages; do \ + mkdir -p $(dirname $i) + touch $i +done %build . /.buildenv @@ -151,6 +169,10 @@ /usr/share/openSUSE %changelog +* Fri May 02 2008 coolo@suse.de +- sign the repo (bnc#385488) +* Wed Apr 30 2008 coolo@suse.de +- creating a product * Tue Apr 29 2008 coolo@suse.de - softlock recommends * Tue Apr 29 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.S18895/_old 2008-05-02 12:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.S18895/_new 2008-05-02 12:11:44.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.0 -Release: 80 +Release: 82 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,9 +42,13 @@ Source8: ifcfg-eth0 Source9: langset.tgz Source10: create_xconf -Source11: zypp.product Source12: correct_live_install Source13: SoftLocks +Source14: livecd_product_repo.repo +Source15: content +Source16: content-x86_64.diff +Source17: gpg-pubkey-8BB1F40D.asc +Source18: gpg-seckey-8BB1F40D.asc ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -90,24 +94,38 @@ mkdir -p root/tmp cd root install -m 644 /CD1/license.tar.gz . -tar cvzf tmp/gpg-pubkey.tgz /CD1/gpg-pubkey* +mkdir rpmkeys +cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml +mkdir gpgkeys +install -m 644 %{SOURCE17} gpgkeys +install -m 644 %{SOURCE17} rpmkeys +install -m 644 %{SOURCE18} gpgkeys install -m 644 %{SOURCE5} tmp/config.patch -mkdir -p var/lib/zypp/db/products/ +mkdir -p var/lib/zypp/livecd_product # see above if test KDE = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE11} > var/lib/zypp/db/products/aae0a680f12121130067466712844104 + sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > var/lib/zypp/livecd_product/content else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE11} > var/lib/zypp/db/products/aae0a680f12121130067466712844104 + sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE15} > var/lib/zypp/livecd_product/content fi +%ifarch x86_64 +patch var/lib/zypp/livecd_product/content %{SOURCE16} +%endif install -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch +install -D -m 644 %{SOURCE14} etc/zypp/repos.d/livecd_product_repo.repo +for i in var/lib/zypp/livecd_product/media.1/media \ + var/lib/zypp/livecd_product/suse/setup/descr/packages; do \ + mkdir -p $(dirname $i) + touch $i +done %build . /.buildenv @@ -151,6 +169,10 @@ /usr/share/openSUSE %changelog +* Fri May 02 2008 coolo@suse.de +- sign the repo (bnc#385488) +* Wed Apr 30 2008 coolo@suse.de +- creating a product * Tue Apr 29 2008 coolo@suse.de - softlock recommends * Tue Apr 29 2008 coolo@suse.de ++++++ config.sh ++++++ --- arch/i386/kiwi-image-livecd-kde/config.sh 2008-04-29 23:22:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-05-02 08:03:03.296172000 +0200 @@ -14,6 +14,9 @@ test -f /.kconfig && . /.kconfig test -f /.profile && . /.profile +exec > /var/log/config.log +exec 2>&1 + #====================================== # Greeting... #-------------------------------------- @@ -31,14 +34,11 @@ # Deactivate services #-------------------------------------- -suseRemoveService boot.multipath suseRemoveService boot.device-mapper suseRemoveService mdadmd -suseRemoveService multipathd suseRemoveService rpasswdd suseRemoveService boot.scsidev suseRemoveService boot.md -suseService boot.rootfsck off # these two we want to disable for policy reasons chkconfig sshd off @@ -51,25 +51,34 @@ patch -p0 < /tmp/config.patch rm /tmp/config.patch -patch -p0 < /etc/YaST2/policy.patch +# disabled for now - if you reenable, don't forget correct_live_install +# bnc#382158 +# patch -p0 < /etc/YaST2/policy.patch -tar xvf /tmp/gpg-pubkey.tgz -rm /tmp/gpg-pubkey.tgz -for i in /CD1/gpg*.asc; do +for i in /rpmkeys/gpg*.asc; do rpm --import $i && rm $i done -rmdir /CD1 +rmdir /rpmkeys +for i in /gpgkeys/gpg*.asc; do + gpg --import $i && rm $i +done +rmdir /gpgkeys +echo "B0462FBF0F7838BD707C125D2E82F4308BB1F40D:6:" | gpg --import-ownertrust insserv -: > /var/log/zypper.log +gpg -a --detach /var/lib/zypp/livecd_product/content +gpg -a --export 8BB1F40D > /var/lib/zypp/livecd_product/content.key + +zypper ref livecd_product_repo + rm -rf /var/cache/zypp/raw/* #zypper addrepo http://download.opensuse.org/repositories/openSUSE:10.3/standard/ 10.3-oss #zypper addrepo http://download.opensuse.org/distribution/10.3/repo/non-oss/ 10.3-non-oss -zypper addrepo http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/ factory-oss -zypper addrepo http://download.opensuse.org/distribution/SL-Factory-non-oss/inst-source-ext... factory-non-oss -zypper addrepo http://download.opensuse.org/update/11.0/ updates +zypper addrepo -d http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/ factory-oss +zypper addrepo -d http://download.opensuse.org/distribution/SL-Factory-non-oss/inst-source-ext... factory-non-oss +zypper addrepo -d http://download.opensuse.org/update/11.0/ updates #====================================== # /etc/sudoers hack to fix #297695 @@ -84,10 +93,6 @@ # empty password is ok pam-config -a --nullok -time=`date +%s` -sed -i -e "s,@INSTALLTIME@,$time," /var/lib/zypp/db/products/aae0a680f12121130067466712844104 - -rm /tmp/zypp.product : > /var/log/zypper.log #====================================== ++++++ content-x86_64.diff ++++++ --- content 2008-03-18 16:27:18.000000000 +0100 +++ content 2008-03-18 16:26:19.000000000 +0100 @@ -5,11 +5,8 @@ TYPE base VENDOR SUSE LINUX Products GmbH, Nuernberg, Germany RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/11.0/release-notes.rpm -ARCH.i686 i686 i586 i486 i386 noarch -ARCH.i586 i586 i486 i386 noarch -ARCH.i486 i486 i386 noarch -ARCH.i386 i386 noarch -DEFAULTBASE i586 +ARCH.x86_64 x86_64 i686 i586 i486 i386 noarch +DEFAULTBASE x86_64 REQUIRES openSUSE-release = 11.0 PATTERNS base x11 gnome LINGUAS de en ++++++ correct_live_install ++++++ --- arch/i386/kiwi-image-livecd-kde/correct_live_install 2008-04-08 17:02:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-04-30 20:46:39.153871000 +0200 @@ -18,6 +18,9 @@ # remove live-cd user userdel linux +# remove the live installer +rpm -e yast2-live-installer + # reset pam config pam-config -d --nullok @@ -31,6 +34,6 @@ chmod 0755 /etc/init.d/boot.local cd / -patch -R -p0 < /etc/YaST2/policy.patch +# patch -R -p0 < /etc/YaST2/policy.patch rm /etc/YaST2/policy.patch ++++++ SoftLocks ++++++ --- arch/i386/kiwi-image-livecd-kde/SoftLocks 2008-04-29 23:37:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/SoftLocks 2008-04-30 21:05:03.488033000 +0200 @@ -38,3 +38,15 @@ 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 +MozillaFirefox-translations + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org