Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory
checked in at Mon Mar 7 15:20:40 CET 2011.
--------
--- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-02-20
12:48:31.000000000 +0100
+++
/mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2011-03-06 12:35:26.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Mar 6 11:35:08 UTC 2011 - [email protected]
+
+- remove package lists package
+
+-------------------------------------------------------------------
+Sat Mar 5 11:43:57 UTC 2011 - [email protected]
+
+- do not use package lists anymore, but require them in config
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.000000000 +0100
+++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.000000000 +0100
@@ -18,7 +18,7 @@
Name: kiwi-config-openSUSE
-BuildRequires: fdupes kiwi-desc-isoboot package-lists-openSUSE-all
+BuildRequires: fdupes kiwi-desc-isoboot
BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools
BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD
BuildRequires: libxslt
@@ -26,7 +26,7 @@
BuildRequires: jing kiwi yast2-country
Summary: KDE live CD
Version: 11.4
-Release: 8
+Release: 9
Group: System/Boot
License: BSD3c(or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -70,15 +70,9 @@
cd $config
desktop=`echo $config | cut -d- -f2`
type=`echo $config | cut -d- -f1`
- cdlist=/usr/share/suse/packages/"$desktop"_cd.%{_target_cpu}.list
- if test "$desktop" = kde; then
- cdlist=/usr/share/suse/packages/kde4_cd.%{_target_cpu}.list
- fi
- test -f "$cdlist" || exit 1
- sort -u $cdlist > wanted.list
if test $type = usb; then
- sed -i -e "s,yast2-live-installer,yast2-firstboot," wanted.list
- sed -i -e "s,release-livecd,release-usb," wanted.list
+ #sed -i -e "s,yast2-live-installer,yast2-firstboot," wanted.list
+ #sed -i -e "s,release-livecd,release-usb," wanted.list
othertype=livecd
else
othertype=usb
@@ -100,18 +94,22 @@
echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' >> config.sh
fi
- (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat wanted.list | while read
pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p'
%{SOURCE4} ) | grep -v " type:$othertype " | \
+ grep -v " type:$othertype " %{SOURCE4} | \
xmllint --format - > config.xml
if test $type = usb; then
sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml
fi
- rm wanted.list
if test $type = usb; then
sed -i -e 's,#USB ,,' config.sh
fi
sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml
sed -i -e "s,@VERSION@,$kiwiversion," config.xml
sed -i -e "s,@FLAVOR@,$config," config.xml
+ if test $desktop = gnome; then
+ sed -i -e "s,@PLIST@,GNOME-cd," config.xml
+ else
+ sed -i -e "s,@PLIST@,KDE-cd," config.xml
+ fi
%ifarch x86_64
sed -i -e "s,@BOOTKERNEL@,desktop," config.xml
%else
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.000000000 +0100
+++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.000000000 +0100
@@ -19,6 +19,9 @@
exec | tee /var/log/config.log
exec 2>&1
+pl=`rpmqpack | grep package-lists-`
+rpm -e $pl
+
#======================================
# Greeting...
#--------------------------------------
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.000000000 +0100
+++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.000000000 +0100
@@ -26,10 +26,10 @@
<user name="root" pwd="" home="/root"/>
</users>
<repository type="yast2">
- <source path="http://download.opensuse.org/distribution/11.4/repo/oss/"/>
+ <source path="http://download.opensuse.org/factory/repo/oss/"/>
</repository>
<repository type="rpm-md">
- <source
path="http://download.opensuse.org/repositories/openSUSE:/11.4:/Live/standard/"/>
+ <source
path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/>
</repository>
<packages type="image" patternType="onlyRequired">
<package name="bootsplash-branding-openSUSE" bootinclude="true"
bootdelete="true"/>
@@ -43,8 +43,8 @@
<package name="tar"/>
<package name="patch"/>
<package name="zypper"/>
- <!-- PACKAGES BEGIN -->
- <!-- PACKAGES END -->
+ <package name="package-lists-openSUSE-@PLIST@"/>
+ <package name="yast2-live-installer"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
