openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2007
- 1 participants
- 1083 discussions
Hello community,
here is the log from the commit of package yast2-trans-fr
checked in at Thu Sep 20 23:03:55 CEST 2007.
--------
--- yast2-trans-fr/yast2-trans-fr.changes 2007-09-13 16:26:45.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-trans-fr/yast2-trans-fr.changes 2007-09-20 17:34:27.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 20 17:34:27 2007 - ke(a)suse.de
+
+- Update to version 2.15.11.
+
+------------------------------------------------------------------------
Old:
----
yast2-trans-fr-2.15.10.tar.bz2
New:
----
yast2-trans-fr-2.15.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-trans-fr.spec ++++++
--- /var/tmp/diff_new_pack.E19609/_old 2007-09-20 23:03:52.000000000 +0200
+++ /var/tmp/diff_new_pack.E19609/_new 2007-09-20 23:03:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-trans-fr (Version 2.15.10)
+# spec file for package yast2-trans-fr (Version 2.15.11)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,23 +11,23 @@
# norootforbuild
Name: yast2-trans-fr
-Version: 2.15.10
+Version: 2.15.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-trans-fr-2.15.10.tar.bz2
-prefix: /usr
+Source0: yast2-trans-fr-2.15.11.tar.bz2
+Prefix: /usr
Provides: locale(yast2:fr)
BuildRequires: pkgconfig yast2-devtools
-BuildArchitectures: noarch
+BuildArch: noarch
Summary: YaST2 - French Translations
%description
YaST2 - French Translations
%prep
-%setup -n yast2-trans-fr-2.15.10
+%setup -n yast2-trans-fr-2.15.11
%build
autoreconf --force --install
@@ -58,8 +58,9 @@
%doc %{prefix}/share/doc/packages/yast2-trans-fr
%dir /usr/share/YaST2/locale
%lang(fr) /usr/share/YaST2/locale/fr
-
%changelog
+* Thu Sep 20 2007 - ke(a)suse.de
+- Update to version 2.15.11.
* Thu Sep 13 2007 - ke(a)suse.de
- Update to version 2.15.10.
* Fri Sep 07 2007 - ke(a)suse.de
++++++ yast2-trans-fr-2.15.10.tar.bz2 -> yast2-trans-fr-2.15.11.tar.bz2 ++++++
++++ 11724 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kiwi
checked in at Thu Sep 20 23:03:49 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-09-20 16:20:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-09-20 17:41:21.993637000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 20 17:28:49 CEST 2007 - ms(a)suse.de
+
+- fixed usage of basename and dirname by using File::Basename and
+ in scripts use /usr/bin/[basename|dirname] so a function can't
+ overwrite the use case here (#326758)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.X17076/_old 2007-09-20 23:03:32.000000000 +0200
+++ /var/tmp/diff_new_pack.X17076/_new 2007-09-20 23:03:32.000000000 +0200
@@ -13,10 +13,10 @@
Name: kiwi
Url: http://kiwi.berlios.de
BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux
-Requires: perl perl-XML-LibXML perl-libwww-perl screen
+Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils
Summary: OpenSuSE - KIWI Image System
Version: 1.64
-Release: 15
+Release: 16
Group: System/Management
License: GPL v2 or later
Source: kiwi.tar.bz2
@@ -327,6 +327,10 @@
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
* Thu Sep 20 2007 - ms(a)suse.de
+- fixed usage of basename and dirname by using File::Basename and
+ in scripts use /usr/bin/[basename|dirname] so a function can't
+ overwrite the use case here (#326758)
+* Thu Sep 20 2007 - ms(a)suse.de
- fixed oemboot linuxrc for vmx raw boot (#309800)
- fixed repartition code in oemboot for small disks (#309800)
* Wed Sep 19 2007 - ms(a)suse.de
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm
--- old/kiwi/modules/KIWIBoot.pm 2007-09-20 11:57:56.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2007-09-20 17:37:50.000000000 +0200
@@ -542,7 +542,7 @@
my $initrd = $this->{initrd};
my $system = $this->{system};
my $oldird = $this->{initrd};
- my $namecd = qx (basename $system); chomp $namecd;
+ my $namecd = basename ($system);
my $status;
my $result;
my $ibasename;
@@ -669,7 +669,7 @@
my $oldird = $this->{initrd};
my $vmsize = $this->{vmsize};
my $diskname = $system.".install.raw";
- my $namecd = qx (basename $system); chomp $namecd;
+ my $namecd = basename ($system);
my $loop = "/dev/loop0";
my $loopfound = 0;
my $status;
@@ -1401,7 +1401,7 @@
$kiwi -> failed ();
return undef;
}
- my $namecd = qx (basename $system); chomp $namecd;
+ my $namecd = basename ($system);
if ($namecd !~ /(.*)-(\d+\.\d+\.\d+)\.raw$/) {
$kiwi -> error ("Couldn't extract version information");
$kiwi -> failed ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh 2007-09-19 18:46:00.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2007-09-20 17:37:50.000000000 +0200
@@ -239,7 +239,7 @@
continue
fi
- local baseLocale=`basename $locale`
+ local baseLocale=`/usr/bin/basename $locale`
local found="no"
for keep in $imageLocales;do
if echo $baseLocale | grep $keep;then
@@ -263,7 +263,7 @@
local tools=$2
for file in `find $tpath`;do
found=0
- base=`basename $file`
+ base=`/usr/bin/basename $file`
for need in $tools;do
if [ $base = $need ];then
found=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2007-09-20 11:57:56.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2007-09-20 17:37:50.000000000 +0200
@@ -23,6 +23,7 @@
use KIWILog;
use KIWIBoot;
use Math::BigFloat;
+use File::Basename;
#==========================================
# Constructor
@@ -1562,7 +1563,7 @@
#==========================================
# copy physical to logical
#------------------------------------------
- my $name = qx (basename $source); chomp $name;
+ my $name = basename ($source);
$kiwi -> info ("Copying physical to logical [$name]...");
my $data = qx (cp -a $source/* $extend 2>&1);
my $code = $? >> 8;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIMigrate.pm new/kiwi/modules/KIWIMigrate.pm
--- old/kiwi/modules/KIWIMigrate.pm 2007-07-23 17:58:44.000000000 +0200
+++ new/kiwi/modules/KIWIMigrate.pm 2007-09-20 17:37:50.000000000 +0200
@@ -22,6 +22,7 @@
#------------------------------------------
use strict;
use File::Find;
+use File::Basename;
use KIWILog;
#==========================================
@@ -475,7 +476,7 @@
foreach my $check (@rpmcheck) {
if ($check =~ /^(\/.*)/) {
my $file = $1;
- my $dir = qx (dirname $file); chomp $dir;
+ my $dir = dirname ($file);
my $ok = 1;
foreach my $exp (@deny) {
if ($file =~ /$exp/) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-09-20 16:17:40.000000000 +0200
+++ new/kiwi/.revision 2007-09-20 17:41:06.000000000 +0200
@@ -1 +1 @@
-633
\ No newline at end of file
+634
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.1/config/kernel-default new/kiwi/system/boot/isoboot/suse-10.1/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-10.1/config/kernel-default 2007-04-05 16:01:51.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-10.1/config/kernel-default 2007-09-20 17:37:41.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.2/config/kernel-default new/kiwi/system/boot/isoboot/suse-10.2/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-10.2/config/kernel-default 2007-04-05 16:01:51.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-10.2/config/kernel-default 2007-09-20 17:37:41.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.3/config/kernel-default new/kiwi/system/boot/isoboot/suse-10.3/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-10.3/config/kernel-default 2007-04-05 16:01:51.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-10.3/config/kernel-default 2007-09-20 17:37:41.000000000 +0200
@@ -84,8 +84,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10/config/kernel-default new/kiwi/system/boot/isoboot/suse-SLED10/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-SLED10/config/kernel-default 2007-05-24 10:23:20.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLED10/config/kernel-default 2007-09-20 17:37:43.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp
--- old/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp 2007-05-24 17:09:03.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp 2007-09-20 17:37:42.000000000 +0200
@@ -79,8 +79,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1/config/kernel-default new/kiwi/system/boot/isoboot/suse-SLED10-SP1/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-SLED10-SP1/config/kernel-default 2007-05-24 10:23:33.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1/config/kernel-default 2007-09-20 17:37:43.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp
--- old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-05-24 17:09:04.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-20 17:37:42.000000000 +0200
@@ -79,8 +79,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10/config/kernel-default new/kiwi/system/boot/isoboot/suse-SLES10/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-SLES10/config/kernel-default 2007-05-24 10:23:16.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLES10/config/kernel-default 2007-09-20 17:37:40.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp
--- old/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp 2007-05-24 17:09:02.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp 2007-09-20 17:37:39.000000000 +0200
@@ -79,8 +79,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1/config/kernel-default new/kiwi/system/boot/isoboot/suse-SLES10-SP1/config/kernel-default
--- old/kiwi/system/boot/isoboot/suse-SLES10-SP1/config/kernel-default 2007-05-24 10:23:29.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1/config/kernel-default 2007-09-20 17:37:40.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp
--- old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-05-24 17:09:03.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-09-20 17:37:39.000000000 +0200
@@ -79,8 +79,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.1/config/kernel-default new/kiwi/system/boot/netboot/suse-10.1/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-10.1/config/kernel-default 2007-09-11 19:55:56.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.1/config/kernel-default 2007-09-20 17:37:34.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.1-smp/config/kernel-smp new/kiwi/system/boot/netboot/suse-10.1-smp/config/kernel-smp
--- old/kiwi/system/boot/netboot/suse-10.1-smp/config/kernel-smp 2007-09-11 19:55:46.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.1-smp/config/kernel-smp 2007-09-20 17:37:32.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.2/config/kernel-default new/kiwi/system/boot/netboot/suse-10.2/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-10.2/config/kernel-default 2007-09-11 19:56:02.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.2/config/kernel-default 2007-09-20 17:37:34.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.2-smp/config/kernel-bigsmp new/kiwi/system/boot/netboot/suse-10.2-smp/config/kernel-bigsmp
--- old/kiwi/system/boot/netboot/suse-10.2-smp/config/kernel-bigsmp 2007-09-11 19:55:49.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.2-smp/config/kernel-bigsmp 2007-09-20 17:37:33.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.3/config/kernel-default new/kiwi/system/boot/netboot/suse-10.3/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-10.3/config/kernel-default 2007-09-11 19:56:07.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.3/config/kernel-default 2007-09-20 17:37:34.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.3-smp/config/kernel-bigsmp new/kiwi/system/boot/netboot/suse-10.3-smp/config/kernel-bigsmp
--- old/kiwi/system/boot/netboot/suse-10.3-smp/config/kernel-bigsmp 2007-09-11 19:55:52.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.3-smp/config/kernel-bigsmp 2007-09-20 17:37:33.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10/config/kernel-default new/kiwi/system/boot/netboot/suse-SLED10/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-SLED10/config/kernel-default 2007-09-11 19:56:18.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLED10/config/kernel-default 2007-09-20 17:37:36.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-smp/config/kernel-smp new/kiwi/system/boot/netboot/suse-SLED10-smp/config/kernel-smp
--- old/kiwi/system/boot/netboot/suse-SLED10-smp/config/kernel-smp 2007-09-11 19:56:10.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLED10-smp/config/kernel-smp 2007-09-20 17:37:35.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-SP1/config/kernel-default new/kiwi/system/boot/netboot/suse-SLED10-SP1/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-SLED10-SP1/config/kernel-default 2007-09-11 19:56:23.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLED10-SP1/config/kernel-default 2007-09-20 17:37:36.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config/kernel-smp new/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config/kernel-smp
--- old/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-11 19:56:13.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-20 17:37:35.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10/config/kernel-default new/kiwi/system/boot/netboot/suse-SLES10/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-SLES10/config/kernel-default 2007-09-11 19:55:36.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLES10/config/kernel-default 2007-09-20 17:37:31.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-smp/config/kernel-smp new/kiwi/system/boot/netboot/suse-SLES10-smp/config/kernel-smp
--- old/kiwi/system/boot/netboot/suse-SLES10-smp/config/kernel-smp 2007-09-11 19:55:29.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLES10-smp/config/kernel-smp 2007-09-20 17:37:31.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-SP1/config/kernel-default new/kiwi/system/boot/netboot/suse-SLES10-SP1/config/kernel-default
--- old/kiwi/system/boot/netboot/suse-SLES10-SP1/config/kernel-default 2007-09-11 19:55:41.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLES10-SP1/config/kernel-default 2007-09-20 17:37:32.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config/kernel-smp new/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config/kernel-smp
--- old/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-09-11 19:55:32.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-09-20 17:37:31.000000000 +0200
@@ -86,8 +86,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-10.2/config/kernel-default new/kiwi/system/boot/oemboot/suse-10.2/config/kernel-default
--- old/kiwi/system/boot/oemboot/suse-10.2/config/kernel-default 2007-09-06 09:56:33.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-10.2/config/kernel-default 2007-09-20 17:37:30.000000000 +0200
@@ -84,8 +84,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-10.3/config/kernel-default new/kiwi/system/boot/oemboot/suse-10.3/config/kernel-default
--- old/kiwi/system/boot/oemboot/suse-10.3/config/kernel-default 2007-09-06 09:56:45.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-10.3/config/kernel-default 2007-09-20 17:37:30.000000000 +0200
@@ -84,8 +84,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config/kernel-default new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config/kernel-default
--- old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config/kernel-default 2007-07-27 14:52:57.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config/kernel-default 2007-09-20 17:37:29.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp
--- old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-07-27 14:52:57.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-20 17:37:29.000000000 +0200
@@ -79,8 +79,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.2/config/kernel-default new/kiwi/system/boot/usbboot/suse-10.2/config/kernel-default
--- old/kiwi/system/boot/usbboot/suse-10.2/config/kernel-default 2007-04-05 16:01:51.000000000 +0200
+++ new/kiwi/system/boot/usbboot/suse-10.2/config/kernel-default 2007-09-20 17:37:38.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.3/config/kernel-default new/kiwi/system/boot/usbboot/suse-10.3/config/kernel-default
--- old/kiwi/system/boot/usbboot/suse-10.3/config/kernel-default 2007-04-05 16:01:51.000000000 +0200
+++ new/kiwi/system/boot/usbboot/suse-10.3/config/kernel-default 2007-09-20 17:37:39.000000000 +0200
@@ -84,8 +84,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10/config/kernel-default new/kiwi/system/boot/usbboot/suse-SLED10/config/kernel-default
--- old/kiwi/system/boot/usbboot/suse-SLED10/config/kernel-default 2007-09-07 11:09:46.000000000 +0200
+++ new/kiwi/system/boot/usbboot/suse-SLED10/config/kernel-default 2007-09-20 17:37:37.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config/kernel-default new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config/kernel-default
--- old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config/kernel-default 2007-09-07 11:09:58.000000000 +0200
+++ new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config/kernel-default 2007-09-20 17:37:37.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.1/config/kernel-default new/kiwi/system/boot/vmxboot/suse-10.1/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-10.1/config/kernel-default 2007-05-24 17:09:12.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-10.1/config/kernel-default 2007-09-20 17:37:45.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.2/config/kernel-default new/kiwi/system/boot/vmxboot/suse-10.2/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-10.2/config/kernel-default 2007-04-05 16:01:52.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-10.2/config/kernel-default 2007-09-20 17:37:46.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.3/config/kernel-default new/kiwi/system/boot/vmxboot/suse-10.3/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-10.3/config/kernel-default 2007-04-05 16:01:52.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-10.3/config/kernel-default 2007-09-20 17:37:46.000000000 +0200
@@ -84,8 +84,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLED10/config/kernel-default new/kiwi/system/boot/vmxboot/suse-SLED10/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-SLED10/config/kernel-default 2007-05-24 17:09:04.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-SLED10/config/kernel-default 2007-09-20 17:37:44.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config/kernel-default new/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config/kernel-default 2007-05-24 17:09:05.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config/kernel-default 2007-09-20 17:37:45.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLES10/config/kernel-default new/kiwi/system/boot/vmxboot/suse-SLES10/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-SLES10/config/kernel-default 2007-05-24 17:09:04.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-SLES10/config/kernel-default 2007-09-20 17:37:44.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config/kernel-default new/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config/kernel-default
--- old/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config/kernel-default 2007-05-24 17:09:05.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config/kernel-default 2007-09-20 17:37:44.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.1/config/kernel-xen new/kiwi/system/boot/xenboot/suse-10.1/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-10.1/config/kernel-xen 2007-05-24 17:09:19.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-10.1/config/kernel-xen 2007-09-20 17:37:48.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.2/config/kernel-xen new/kiwi/system/boot/xenboot/suse-10.2/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-10.2/config/kernel-xen 2007-04-05 16:01:52.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-10.2/config/kernel-xen 2007-09-20 17:37:49.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.3/config/kernel-xen new/kiwi/system/boot/xenboot/suse-10.3/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-10.3/config/kernel-xen 2007-06-06 11:48:03.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-10.3/config/kernel-xen 2007-09-20 17:37:49.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLED10/config/kernel-xen new/kiwi/system/boot/xenboot/suse-SLED10/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-SLED10/config/kernel-xen 2007-05-24 17:09:13.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-SLED10/config/kernel-xen 2007-09-20 17:37:47.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLED10-SP1/config/kernel-xen new/kiwi/system/boot/xenboot/suse-SLED10-SP1/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-SLED10-SP1/config/kernel-xen 2007-05-24 17:09:14.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-SLED10-SP1/config/kernel-xen 2007-09-20 17:37:48.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLES10/config/kernel-xen new/kiwi/system/boot/xenboot/suse-SLES10/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-SLES10/config/kernel-xen 2007-05-24 17:09:13.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-SLES10/config/kernel-xen 2007-09-20 17:37:47.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLES10-SP1/config/kernel-xen new/kiwi/system/boot/xenboot/suse-SLES10-SP1/config/kernel-xen
--- old/kiwi/system/boot/xenboot/suse-SLES10-SP1/config/kernel-xen 2007-05-24 17:09:14.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-SLES10-SP1/config/kernel-xen 2007-09-20 17:37:47.000000000 +0200
@@ -81,8 +81,8 @@
# handle misc drivers...
#------------------------------------------
test ! -z "$drivers";for i in $drivers;do
- path=`dirname $i`
- base=`basename $i`
+ path=`/usr/bin/dirname $i`
+ base=`/usr/bin/basename $i`
if [ "$base" = "*" ];then
test -d /tmp/$path && \
mkdir -p /tmp/misc-used/$path && \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-trans-fi
checked in at Thu Sep 20 23:03:45 CEST 2007.
--------
--- yast2-trans-fi/yast2-trans-fi.changes 2007-09-17 14:16:19.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-trans-fi/yast2-trans-fi.changes 2007-09-20 17:39:38.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 20 17:39:38 2007 - ke(a)suse.de
+
+- Update to version 2.15.19.
+
+------------------------------------------------------------------------
Old:
----
yast2-trans-fi-2.15.18.tar.bz2
New:
----
yast2-trans-fi-2.15.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-trans-fi.spec ++++++
--- /var/tmp/diff_new_pack.u18748/_old 2007-09-20 23:03:42.000000000 +0200
+++ /var/tmp/diff_new_pack.u18748/_new 2007-09-20 23:03:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-trans-fi (Version 2.15.18)
+# spec file for package yast2-trans-fi (Version 2.15.19)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-trans-fi
-Version: 2.15.18
+Version: 2.15.19
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-trans-fi-2.15.18.tar.bz2
+Source0: yast2-trans-fi-2.15.19.tar.bz2
Prefix: /usr
Provides: locale(yast2:fi)
BuildRequires: pkgconfig yast2-devtools
@@ -30,7 +30,7 @@
%prep
-%setup -n yast2-trans-fi-2.15.18
+%setup -n yast2-trans-fi-2.15.19
%build
autoreconf --force --install
@@ -61,8 +61,9 @@
%doc %{prefix}/share/doc/packages/yast2-trans-fi
%dir /usr/share/YaST2/locale
%lang(fi) /usr/share/YaST2/locale/fi
-
%changelog
+* Thu Sep 20 2007 - ke(a)suse.de
+- Update to version 2.15.19.
* Mon Sep 17 2007 - ke(a)suse.de
- Update to version 2.15.18.
* Thu Sep 13 2007 - ke(a)suse.de
++++++ yast2-trans-fi-2.15.18.tar.bz2 -> yast2-trans-fi-2.15.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-fi-2.15.18/configure new/yast2-trans-fi-2.15.19/configure
--- old/yast2-trans-fi-2.15.18/configure 2007-09-17 14:16:29.000000000 +0200
+++ new/yast2-trans-fi-2.15.19/configure 2007-09-20 17:39:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-trans-fi 2.15.18.
+# Generated by GNU Autoconf 2.60 for yast2-trans-fi 2.15.19.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-trans-fi'
PACKAGE_TARNAME='yast2-trans-fi'
-PACKAGE_VERSION='2.15.18'
-PACKAGE_STRING='yast2-trans-fi 2.15.18'
+PACKAGE_VERSION='2.15.19'
+PACKAGE_STRING='yast2-trans-fi 2.15.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1186,7 +1186,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-trans-fi 2.15.18 to adapt to many kinds of systems.
+\`configure' configures yast2-trans-fi 2.15.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1257,7 +1257,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-trans-fi 2.15.18:";;
+ short | recursive ) echo "Configuration of yast2-trans-fi 2.15.19:";;
esac
cat <<\_ACEOF
@@ -1337,7 +1337,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-trans-fi configure 2.15.18
+yast2-trans-fi configure 2.15.19
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1351,7 +1351,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-trans-fi $as_me 2.15.18, which was
+It was created by yast2-trans-fi $as_me 2.15.19, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2152,7 +2152,7 @@
# Define the identity of the package.
PACKAGE='yast2-trans-fi'
- VERSION='2.15.18'
+ VERSION='2.15.19'
cat >>confdefs.h <<_ACEOF
@@ -2379,7 +2379,7 @@
-VERSION="2.15.18"
+VERSION="2.15.19"
RPMNAME="yast2-trans-fi"
MAINTAINER="Karl Eichwalder <ke(a)suse.de>"
@@ -3316,7 +3316,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-trans-fi $as_me 2.15.18, which was
+This file was extended by yast2-trans-fi $as_me 2.15.19, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3359,7 +3359,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-trans-fi config.status 2.15.18
+yast2-trans-fi config.status 2.15.19
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-fi-2.15.18/configure.in new/yast2-trans-fi-2.15.19/configure.in
--- old/yast2-trans-fi-2.15.18/configure.in 2007-09-17 14:16:25.000000000 +0200
+++ new/yast2-trans-fi-2.15.19/configure.in 2007-09-20 17:39:43.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-trans-fi, 2.15.18, http://bugs.opensuse.org/, yast2-trans-fi)
+AC_INIT(yast2-trans-fi, 2.15.19, http://bugs.opensuse.org/, yast2-trans-fi)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.18"
+VERSION="2.15.19"
RPMNAME="yast2-trans-fi"
MAINTAINER="Karl Eichwalder <ke(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-fi-2.15.18/VERSION new/yast2-trans-fi-2.15.19/VERSION
--- old/yast2-trans-fi-2.15.18/VERSION 2007-09-17 14:16:19.000000000 +0200
+++ new/yast2-trans-fi-2.15.19/VERSION 2007-09-20 17:39:38.000000000 +0200
@@ -1 +1 @@
-2.15.18
+2.15.19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gdm
checked in at Thu Sep 20 23:03:23 CEST 2007.
--------
--- GNOME/gdm/gdm.changes 2007-09-18 20:44:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2007-09-20 20:04:25.363622000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 20 20:01:48 CEST 2007 - banderso(a)suse.de
+
+- added gdm-language-save.patch. Patch fixes a problem where the
+ .dmrc file was not getting created in the process of saving the
+ default selected language.
+ Novell bug #309066
+
+-------------------------------------------------------------------
Old:
----
fix-desktop-files.diff
New:
----
gdm-language-save.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.G15635/_old 2007-09-20 23:02:59.000000000 +0200
+++ /var/tmp/diff_new_pack.G15635/_new 2007-09-20 23:02:59.000000000 +0200
@@ -22,7 +22,7 @@
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.20.0
-Release: 1
+Release: 2
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -54,8 +54,9 @@
# don't ask.
Patch38: gdm-2.19.3-token-login2.patch
Patch40: gdm-XKeepsCrashing-SaX2.patch
-Patch42: fix-desktop-files.diff
+#Patch42: fix-desktop-files.diff
Patch43: gdm-language-hang.patch
+Patch44: gdm-language-save.patch
Url: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
DocDir: %{_defaultdocdir}
@@ -112,6 +113,7 @@
%patch40
#%patch42 - dont think this patch is needed with suse_udpate_desktop_file -g working.
%patch43
+%patch44
gnome-patch-translation-update
%build
@@ -243,8 +245,12 @@
%endif
%files lang -f %{name}.lang
-
%changelog
+* Thu Sep 20 2007 - banderso(a)suse.de
+- added gdm-language-save.patch. Patch fixes a problem where the
+ .dmrc file was not getting created in the process of saving the
+ default selected language.
+ Novell bug #309066
* Tue Sep 18 2007 - hpj(a)suse.de
- Updated gdm-2.8.0.0-any-hostname-auth.patch to use localhost
instead of localhost.localdomain for xauth tokens. Related to
++++++ gdm-language-save.patch ++++++
--- daemon/gdm-daemon-config.c 2007-09-19 16:40:33.000000000 -0600
+++ daemon/gdm-daemon-config.c 2007-09-19 16:17:30.000000000 -0600
@@ -2846,10 +2846,20 @@
gchar *cfgstr;
cfgstr = g_build_filename (home_dir, ".dmrc", NULL);
-
dmrc = gdm_common_config_load (cfgstr, NULL);
if (dmrc == NULL) {
- return;
+ gint fd = -1;
+ gdm_debug ("file: %s does not exist - creating it", cfgstr);
+ VE_IGNORE_EINTR (fd = g_open (cfgstr, O_CREAT | O_TRUNC | O_RDWR, 0644));
+ if (fd < 0) return;
+ write (fd, "\n", 2);
+ close (fd);
+ dmrc = gdm_common_config_load (cfgstr, NULL);
+ if (dmrc == NULL) {
+ gdm_debug ("failed to open %s after creating it", cfgstr);
+ return;
+ }
+
}
if (savesess) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Sep 20 16:34:44 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-09-18 19:52:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-09-20 12:29:59.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 20 12:23:01 CEST 2007 - locilka(a)suse.cz
+
+- Changed inst_upgrade_urls to add sources not enabled during the
+ upgrade in a disabled state instead of ignoring them (#326342).
+- 2.15.51
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.50.tar.bz2
New:
----
yast2-installation-2.15.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.V15133/_old 2007-09-20 16:33:11.000000000 +0200
+++ /var/tmp/diff_new_pack.V15133/_new 2007-09-20 16:33:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.50)
+# spec file for package yast2-installation (Version 2.15.51)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.15.50
+Version: 2.15.51
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.50.tar.bz2
+Source0: yast2-installation-2.15.51.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
# Mode::live_installation
@@ -67,12 +67,12 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.15.50
+Version: 2.15.51
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.50.tar.bz2
+Source0: yast2-installation-2.15.51.tar.bz2
Prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -105,7 +105,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.15.50
+%setup -n yast2-installation-2.15.51
%build
%{prefix}/bin/y2tool y2autoconf
@@ -176,8 +176,11 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYRIGHT.english
%exclude %{prefix}/share/doc/packages/yast2-installation/README
-
%changelog
+* Thu Sep 20 2007 - locilka(a)suse.cz
+- Changed inst_upgrade_urls to add sources not enabled during the
+ upgrade in a disabled state instead of ignoring them (#326342).
+- 2.15.51
* Tue Sep 18 2007 - locilka(a)suse.cz
- Fixed tar syntax: --ignore-failed-read param. position (#326055).
- 2.15.50
++++++ yast2-installation-2.15.50.tar.bz2 -> yast2-installation-2.15.51.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.50/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.15.51/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.15.50/src/clients/inst_upgrade_urls.ycp 2007-09-13 16:13:43.000000000 +0200
+++ new/yast2-installation-2.15.51/src/clients/inst_upgrade_urls.ycp 2007-09-20 15:09:01.000000000 +0200
@@ -225,6 +225,24 @@
return ret;
}
+ string FindURLType (string baseurl) {
+ if (baseurl == "" || baseurl == nil) {
+ y2error ("Base URL not defined!");
+ return "";
+ }
+
+ string ret = "";
+
+ foreach (map one_url, urls, {
+ if (baseurl == one_url["url"]:"-A-" && one_url["type"]:"" != "") {
+ ret = one_url["type"]:"";
+ break;
+ }
+ });
+
+ return ret;
+ }
+
void EditItem (integer currentitem) {
if (currentitem == nil || currentitem < 0) {
y2error ("Cannot edit item: %1", currentitem);
@@ -276,11 +294,18 @@
enabled = one_url_map["enabled"]:false;
}
- urls = add (urls, $[
+ map <string, any> new_url_map = $[
"url" : one_url_map["baseurl"]:nil,
"name" : (one_url_map["name"]:"" == "" ? one_url_map["id"]:"" : one_url_map["name"]:""),
"enabled" : enabled,
- ]);
+ ];
+
+ // store the repo-type as well
+ if (one_url_map["type"]:"" != "") {
+ new_url_map["type"] = one_url_map["type"]:"";
+ }
+
+ urls = add (urls, new_url_map);
});
// Fallback, old URLs found
// 10.1, 10.2, 10.3 ...
@@ -423,7 +448,8 @@
list <integer> sources_to_remove = [];
list <string> sources_to_add = [];
-
+ // bugzilla #308763
+ list <string> sources_to_add_disabled = [];
foreach (map one_source, urls, {
string url = one_source["url"]:"";
@@ -434,11 +460,16 @@
if (current_medianr == nil) {
sources_to_add = add (sources_to_add, url);
}
+
// Source should be disabled at the end
} else if (one_source["url_will_be_enabled"]:nil == false) {
+ // already registered
if (current_medianr != nil) {
sources_to_remove = add (sources_to_remove, current_medianr);
}
+
+ // will be added
+ sources_to_add_disabled = add (sources_to_add_disabled, url);
}
});
@@ -459,8 +490,10 @@
});
// Remote repositories need network
- if ((size(sources_to_add) > 0) && NetworkRunning()) {
- y2milestone ("Adding repos: %1", sources_to_add);
+ // Adding sources in a disabled state, then enable them
+ // for the system upgrade
+ if ((size (sources_to_add) > 0) && NetworkRunning()) {
+ y2milestone ("Adding ENABLED repos: %1", sources_to_add);
foreach (string one_url, sources_to_add, {
string repo_type = Pkg::RepositoryProbe (one_url, "/");
@@ -488,7 +521,7 @@
"alias" : GetUniqueAlias (one_url),
"type" : repo_type,
];
- y2milestone ("Adding: %1", repoadd);
+ y2milestone ("Adding repo (enabled): %1", repoadd);
integer new_id = Pkg::RepositoryAdd (repoadd);
@@ -515,6 +548,41 @@
});
}
+ // Adding the rest of sources in a disabled state
+ // bugzilla #326342
+ if (size (sources_to_add_disabled) > 0) {
+ y2milestone ("Adding DISABLED repos: %1", sources_to_add_disabled);
+
+ foreach (string one_url, sources_to_add_disabled, {
+ string repo_name = FindURLName (one_url);
+ // fallback
+ if (repo_name == nil) repo_name = "";
+ string pth = "/";
+
+ // see bugzilla #310209
+ // Adding repositories with their correct names
+ map <string, any> repoadd = $[
+ "enabled" : false,
+ "name" : repo_name,
+ "base_urls" : [one_url],
+ "prod_dir" : pth,
+ // alias needs to be unique
+ // bugzilla #309317
+ "alias" : GetUniqueAlias (one_url),
+ ];
+
+ // do not probe! adding as disabled!
+ string repo_type = FindURLType (one_url);
+ if (repo_type != nil && repo_type != "") {
+ repoadd["type"] = repo_type;
+ }
+
+ y2milestone ("Adding repo (disabled): %1", repoadd);
+
+ integer new_id = Pkg::RepositoryAdd (repoadd);
+ });
+ }
+
return `next;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.50/VERSION new/yast2-installation-2.15.51/VERSION
--- old/yast2-installation-2.15.50/VERSION 2007-09-18 19:50:40.000000000 +0200
+++ new/yast2-installation-2.15.51/VERSION 2007-09-20 12:30:04.000000000 +0200
@@ -1 +1 @@
-2.15.50
+2.15.51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pam_mount
checked in at Thu Sep 20 16:32:53 CEST 2007.
--------
--- pam_mount/pam_mount.changes 2007-04-04 17:52:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/pam_mount/pam_mount.changes 2007-09-20 15:07:18.794472000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 20 15:05:57 CEST 2007 - mc(a)suse.de
+
+- add required dependencies [#326802]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_mount.spec ++++++
--- /var/tmp/diff_new_pack.z12162/_old 2007-09-20 16:32:31.000000000 +0200
+++ /var/tmp/diff_new_pack.z12162/_new 2007-09-20 16:32:31.000000000 +0200
@@ -14,8 +14,10 @@
BuildRequires: glib2-devel openssl-devel pam-devel zlib-devel
Summary: A PAM Module that can Mount Volumes for a User Session.
Version: 0.18
-Release: 42
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Release: 79
+Requires: lsof coreutils util-linux
+Recommends: cryptsetup
+License: LGPL v2 or later
Prefix: /usr
Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
@@ -25,7 +27,7 @@
Patch3: pam_mount-0.18-disable-debug.diff
Patch4: pam_mount-0.18-fix-pmvarrun-ref-count.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-URL: http://pam-mount.sourceforge.net/
+Url: http://pam-mount.sourceforge.net/
%description
This module is aimed at environments with SMB (Samba or Windows NT) or
@@ -101,8 +103,9 @@
%doc %{_mandir}/man8/passwdehd.8.gz
%doc %{_mandir}/man8/pmvarrun.8.gz
%doc %{_mandir}/man8/umount.crypt.8.gz
-
%changelog
+* Thu Sep 20 2007 - mc(a)suse.de
+- add required dependencies [#326802]
* Wed Apr 04 2007 - crivera(a)suse.de
- Don't package mount_ehd, it's only for
OpenBSD. Fixes 256214.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libzypp
checked in at Thu Sep 20 16:32:20 CEST 2007.
--------
--- libzypp/libzypp.changes 2007-09-20 11:23:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2007-09-20 15:38:11.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 20 15:19:53 CEST 2007 - ma(a)suse.de
+
+- Avoid calling rpm repeatedly in case of an error. This is fault-prone,
+ esp. if the error occurred executing the packages post-install script.
+- version 3.24.5
+- revision 7317
+
+-------------------------------------------------------------------
Old:
----
libzypp-3.24.4.tar.bz2
New:
----
libzypp-3.24.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.n10268/_old 2007-09-20 16:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.n10268/_new 2007-09-20 16:31:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 3.24.4)
+# spec file for package libzypp (Version 3.24.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,9 +16,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 3.24.4
+Version: 3.24.5
Release: 1
-Source: libzypp-3.24.4.tar.bz2
+Source: libzypp-3.24.5.tar.bz2
Source1: libzypp-rpmlintrc
Prefix: /usr
Provides: yast2-packagemanager
@@ -44,7 +44,7 @@
Ladislav Slezak <lslezak(a)suse.cz>
%package devel
-Requires: libzypp == 3.24.4
+Requires: libzypp == 3.24.5
Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel
Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
Requires: cmake
@@ -129,6 +129,11 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog
* Thu Sep 20 2007 - ma(a)suse.de
+- Avoid calling rpm repeatedly in case of an error. This is fault-prone,
+ esp. if the error occurred executing the packages post-install script.
+- version 3.24.5
+- revision 7317
+* Thu Sep 20 2007 - ma(a)suse.de
- If a package is deselected by user, apply this soft lock to all
available versions of this package.
- version 3.24.4
++++++ libzypp-3.24.4.tar.bz2 -> libzypp-3.24.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.24.4/devel/devel.ma/Parse.cc new/libzypp-3.24.5/devel/devel.ma/Parse.cc
--- old/libzypp-3.24.4/devel/devel.ma/Parse.cc 2007-09-20 11:23:13.000000000 +0200
+++ new/libzypp-3.24.5/devel/devel.ma/Parse.cc 2007-09-20 15:38:01.000000000 +0200
@@ -308,6 +308,11 @@
return true;
}
+bool install()
+{
+ SEC << getZYpp()->commit( ZYppCommitPolicy() ) << endl;
+}
+
///////////////////////////////////////////////////////////////////
struct ConvertDbReceive : public callback::ReceiveReport<target::ScriptResolvableReport>
@@ -553,32 +558,22 @@
USR << "pool: " << pool << endl;
SEC << pool.knownRepositoriesSize() << endl;
- if ( 0 )
+ if ( 1 )
{
{
- zypp::base::LogControl::TmpLineWriter shutUp;
- //getZYpp()->initTarget( sysRoot );
- getZYpp()->initTarget( "/" );
+ zypp::base::LogControl::TmpLineWriter shutUp;
+ getZYpp()->initTarget( sysRoot );
+ //getZYpp()->initTarget( "/" );
}
MIL << "Added target: " << pool << endl;
}
//std::for_each( pool.begin(), pool.end(), Xprint() );
-
- repo::DeltaCandidates deltas( repo::makeDeltaCandidates( pool.knownRepositoriesBegin(),
- pool.knownRepositoriesEnd() ) );
-
- DBG << "patch: " << deltas.patchRpms(0).size() << " " << deltas.patchRpms(0) << endl;
- DBG << "delta: " << deltas.deltaRpms(0).size() << " " << deltas.deltaRpms(0) << endl;
-
- PoolItem pi( getPi<Package>( "kernel-default", Edition("2.6.22.5-12") ) );
- USR << pi << endl;
- USR << repoProvidePackage( pi ) << endl;
-
- pi = getPi<Package>( "update-test-affects-package-manager", Edition("99-99") );
+ PoolItem pi = getPi<Package>( "update-test-affects-package-manager", Edition("99-99") );
USR << pi << endl;
- USR << repoProvidePackage( pi ) << endl;
+ pi.status().setTransact( true, ResStatus::USER );
+ //install();
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.24.4/package/libzypp.changes new/libzypp-3.24.5/package/libzypp.changes
--- old/libzypp-3.24.4/package/libzypp.changes 2007-09-20 11:23:13.000000000 +0200
+++ new/libzypp-3.24.5/package/libzypp.changes 2007-09-20 15:38:02.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 20 15:19:53 CEST 2007 - ma(a)suse.de
+
+- Avoid calling rpm repeatedly in case of an error. This is fault-prone,
+ esp. if the error occurred executing the packages post-install script.
+- version 3.24.5
+- revision 7317
+
+-------------------------------------------------------------------
Thu Sep 20 11:00:04 CEST 2007 - ma(a)suse.de
- If a package is deselected by user, apply this soft lock to all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.24.4/VERSION.cmake new/libzypp-3.24.5/VERSION.cmake
--- old/libzypp-3.24.4/VERSION.cmake 2007-09-20 11:23:13.000000000 +0200
+++ new/libzypp-3.24.5/VERSION.cmake 2007-09-20 15:38:02.000000000 +0200
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "24")
SET(LIBZYPP_COMPATMINOR "24")
-SET(LIBZYPP_PATCH "4")
+SET(LIBZYPP_PATCH "5")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.24.4/zypp/target/TargetImpl.cc new/libzypp-3.24.5/zypp/target/TargetImpl.cc
--- old/libzypp-3.24.4/zypp/target/TargetImpl.cc 2007-09-20 11:23:14.000000000 +0200
+++ new/libzypp-3.24.5/zypp/target/TargetImpl.cc 2007-09-20 15:38:02.000000000 +0200
@@ -519,78 +519,50 @@
progress.connect();
bool success = true;
unsigned flags = 0;
+ // Why force and nodeps?
+ //
+ // Because zypp builds the transaction and the resolver asserts that
+ // everything is fine.
+ // We use rpm just to unpack and register the package in the database.
+ // We do this step by step, so rpm is not aware of the bigger context.
+ // So we turn off rpms internal checks, because we do it inside zypp.
+ flags |= rpm::RpmDb::RPMINST_NODEPS;
+ flags |= rpm::RpmDb::RPMINST_FORCE;
+ //
if (p->installOnly()) flags |= rpm::RpmDb::RPMINST_NOUPGRADE;
if (policy_r.dryRun()) flags |= rpm::RpmDb::RPMINST_TEST;
if (policy_r.rpmNoSignature()) flags |= rpm::RpmDb::RPMINST_NOSIGNATURE;
try
{
- progress.tryLevel( target::rpm::InstallResolvableReport::RPM );
+ progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );
rpm().installPackage( localfile, flags );
if ( progress.aborted() )
{
WAR << "commit aborted by the user" << endl;
progress.disconnect();
+ success = false;
abort = true;
break;
}
-
}
catch (Exception & excpt_r)
{
ZYPP_CAUGHT(excpt_r);
- WAR << "Install failed, retrying with --nodeps" << endl;
- if (policy_r.dryRun())
+ if ( policy_r.dryRun() )
{
WAR << "dry run failed" << endl;
progress.disconnect();
break;
}
-
- try
- {
- progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS );
- flags |= rpm::RpmDb::RPMINST_NODEPS;
- rpm().installPackage( localfile, flags );
-
- if ( progress.aborted() )
- {
- WAR << "commit aborted by the user" << endl;
- abort = true;
- progress.disconnect();
- break;
- }
- }
- catch (Exception & excpt_r)
- {
- ZYPP_CAUGHT(excpt_r);
- WAR << "Install failed again, retrying with --force --nodeps" << endl;
-
- try
- {
- progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );
- flags |= rpm::RpmDb::RPMINST_FORCE;
- rpm().installPackage( localfile, flags );
- }
- catch (Exception & excpt_r)
- {
- remaining.push_back( *it );
- success = false;
- ZYPP_CAUGHT(excpt_r);
- }
-
- if ( progress.aborted() )
- {
- WAR << "commit aborted by the user" << endl;
- abort = true;
- progress.disconnect();
- break;
- }
- }
+ // else
+ WAR << "Install failed" << endl;
+ remaining.push_back( *it );
+ success = false;
}
- if (success
- && !policy_r.dryRun())
+
+ if ( success && !policy_r.dryRun() )
{
it->status().resetTransact( ResStatus::USER );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.24.4/zypp/ZYppCallbacks.h new/libzypp-3.24.5/zypp/ZYppCallbacks.h
--- old/libzypp-3.24.4/zypp/ZYppCallbacks.h 2007-09-20 11:23:14.000000000 +0200
+++ new/libzypp-3.24.5/zypp/ZYppCallbacks.h 2007-09-20 15:38:02.000000000 +0200
@@ -24,12 +24,12 @@
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
-
+
struct ProgressReport : public callback::ReportBase
{
virtual void start( const ProgressData &/*task*/ )
{}
-
+
virtual bool progress( const ProgressData &/*task*/ )
{ return true; }
@@ -46,7 +46,7 @@
struct ProgressReportAdaptor
{
-
+
ProgressReportAdaptor( const ProgressData::ReceiverFnc &fnc,
callback::SendReport<ProgressReport> &report )
: _fnc(fnc)
@@ -54,7 +54,7 @@
, _first(true)
{
}
-
+
bool operator()( const ProgressData &progress )
{
if ( _first )
@@ -62,27 +62,27 @@
_report->start(progress);
_first = false;
}
-
+
_report->progress(progress);
bool value = true;
if ( _fnc )
value = _fnc(progress);
-
-
+
+
if ( progress.finalReport() )
{
_report->finish(progress);
}
return value;
}
-
+
ProgressData::ReceiverFnc _fnc;
callback::SendReport<ProgressReport> &_report;
bool _first;
};
-
+
////////////////////////////////////////////////////////////////////////////
-
+
namespace repo
{
// progress for downloading a resolvable
@@ -343,7 +343,7 @@
{
/**
* Prompt for authentication data.
- *
+ *
* \param url URL which required the authentication
* \param msg prompt text
* \param auth_data input/output object for handling authentication
@@ -425,6 +425,7 @@
};
// the level of RPM pushing
+ /** \deprecated We fortunately no longer do 3 attempts. */
enum RpmLevel {
RPM,
RPM_NODEPS,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libssui
checked in at Thu Sep 20 16:31:26 CEST 2007.
--------
--- GNOME/libssui/libssui.changes 2007-09-14 01:29:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/libssui/libssui.changes 2007-09-20 16:11:28.091557000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 20 16:09:57 CEST 2007 - cgaisford(a)novell.com
+
+- After the gnome 2.20 drop, I updated the panel-power-manager code
+ in libssui from the gnome-panel project to fix up the new dbus
+ interfaces. Bug #326815
+
+-------------------------------------------------------------------
New:
----
libssui-pm-dbus.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libssui.spec ++++++
--- /var/tmp/diff_new_pack.qf3706/_old 2007-09-20 16:30:09.000000000 +0200
+++ /var/tmp/diff_new_pack.qf3706/_new 2007-09-20 16:30:09.000000000 +0200
@@ -16,7 +16,7 @@
Group: System/GUI/GNOME
AutoReqProv: on
Version: 0.5.7
-Release: 21
+Release: 25
Summary: Session UI for SLED
Source: libssui-%{version}.tar.gz
Source1: libssui-po.tar.bz2
@@ -24,6 +24,7 @@
Patch1: libssui-missing-options.patch
Patch2: libssui-kdm-support.patch
Patch3: libssui-wrong-icon-bug308812.patch
+Patch4: libssui-pm-dbus.patch
Url: http://code.google.com/p/libssui/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2
@@ -63,6 +64,7 @@
%patch1 -p1
%patch2
%patch3
+%patch4
%build
autoreconf -f -i
@@ -102,8 +104,11 @@
%{_prefix}/%_lib/pkgconfig/*
%dir %{_prefix}/include/libssui
%{_prefix}/include/libssui/*
-
%changelog
+* Thu Sep 20 2007 - cgaisford(a)novell.com
+- After the gnome 2.20 drop, I updated the panel-power-manager code
+ in libssui from the gnome-panel project to fix up the new dbus
+ interfaces. Bug #326815
* Fri Sep 14 2007 - sreeves(a)suse.de
- Fix for Bug #308812 - wrong icon.
* Thu Sep 13 2007 - cgaisford(a)novell.com
++++++ libssui-pm-dbus.patch ++++++
--- src/gnome-session-code/panel-power-manager.c
+++ src/gnome-session-code/panel-power-manager.c
@@ -129,7 +129,7 @@
const char *new_owner,
PanelPowerManager *manager)
{
- if (strcmp (name, "org.gnome.PowerManager") != 0)
+ if (strcmp (name, "org.freedesktop.PowerManagement") != 0)
return;
if (manager->priv->gpm_proxy != NULL) {
@@ -189,9 +189,9 @@
manager->priv->gpm_proxy =
dbus_g_proxy_new_for_name_owner (
manager->priv->dbus_connection,
- "org.gnome.PowerManager",
- "/org/gnome/PowerManager",
- "org.gnome.PowerManager",
+ "org.freedesktop.PowerManagement",
+ "/org/freedesktop/PowerManagement",
+ "org.freedesktop.PowerManagement",
&connection_error);
if (manager->priv->gpm_proxy == NULL) {
@@ -324,8 +324,7 @@
}
can_suspend = FALSE;
-// if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
- if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend",
+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
&error,
G_TYPE_INVALID,
G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
@@ -356,8 +355,7 @@
}
can_hibernate = FALSE;
-// if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
- if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate",
+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
&error,
G_TYPE_INVALID,
G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kiwi
checked in at Thu Sep 20 16:30:00 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-09-20 12:02:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-09-20 16:20:38.368777000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 20 14:44:02 CEST 2007 - ms(a)suse.de
+
+- fixed oemboot linuxrc for vmx raw boot (#309800)
+- fixed repartition code in oemboot for small disks (#309800)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.Et1387/_old 2007-09-20 16:29:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Et1387/_new 2007-09-20 16:29:49.000000000 +0200
@@ -16,7 +16,7 @@
Requires: perl perl-XML-LibXML perl-libwww-perl screen
Summary: OpenSuSE - KIWI Image System
Version: 1.64
-Release: 14
+Release: 15
Group: System/Management
License: GPL v2 or later
Source: kiwi.tar.bz2
@@ -326,6 +326,9 @@
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Thu Sep 20 2007 - ms(a)suse.de
+- fixed oemboot linuxrc for vmx raw boot (#309800)
+- fixed repartition code in oemboot for small disks (#309800)
* Wed Sep 19 2007 - ms(a)suse.de
- added check for isolinux-config in suse-isolinux
- added checks for copy calls in KIWIImage.pm while creating
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-09-20 12:01:29.000000000 +0200
+++ new/kiwi/.revision 2007-09-20 16:17:40.000000000 +0200
@@ -1 +1 @@
-632
\ No newline at end of file
+633
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-linuxrc new/kiwi/system/boot/oemboot/suse-linuxrc
--- old/kiwi/system/boot/oemboot/suse-linuxrc 2007-09-20 11:57:55.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-09-20 16:14:04.000000000 +0200
@@ -134,6 +134,8 @@
export UNIONFS_CONFIG="$deviceDisk"3,"$deviceDisk"2,aufs
export deviceRoot="$deviceDisk"2
export deviceSwap="$deviceDisk"4
+ else
+ export deviceRoot="$deviceDisk"1
fi
Echo "Using root partition $deviceRoot on disk $deviceDisk"
fi
@@ -345,7 +347,26 @@
# ----
input=/part.input
rm -f $input
- for cmd in d n p 2 1 +10240M n p 1 . +"$swapsize"M n p 3 . . t 1 82 w;do
+ disk1MBytes=10240
+ diskXMBytes=`sfdisk -s $deviceDisk`
+ diskXMBytes=`expr $diskXMBytes / 1024`
+ if [ $disk1MBytes -gt $diskXMBytes ];then
+ # /.../
+ # Very small disk, we use half of the size for root and
+ # assume the rest is ok for /home and /. Additionally we set
+ # the swap space to 50MB. All this could fail if the disk
+ # is really small so that / doesn't fit into half of
+ # $diskXMBytes
+ # ----
+ disk1MBytes=`expr $diskXMBytes / 2`
+ swapsize=50
+ fi
+ for cmd in \
+ d n p 2 1 +"$disk1MBytes"M \
+ n p 1 . +"$swapsize"M \
+ n p 3 . . \
+ t 1 82 w
+ do
if [ $cmd = "." ];then
echo >> $input
continue
@@ -391,6 +412,18 @@
disk2MBytes=`expr $disk2MBytes / 1024`
disk3MBytes=`expr $diskXMBytes - $disk1MBytes - $disk2MBytes`
disk3MBytes=`expr $disk3MBytes - $swapXMBytes`
+ if [ $disk3MBytes -lt 100 ];then
+ # /.../
+ # Very small disk, we use only 50MB of swap and assume
+ # that the rest disk space is big enough to create the
+ # RW and swap partition. All this could fail if the disk
+ # is not big enough compared to the system image already
+ # installed
+ # ----
+ swapsize=50
+ disk3MBytes=`expr $diskXMBytes - $disk1MBytes - $disk2MBytes`
+ disk3MBytes=`expr $disk3MBytes - $swapXMBytes`
+ fi
#======================================
# 8.3 write new partition table
#--------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package hal
checked in at Thu Sep 20 16:29:40 CEST 2007.
--------
--- hal/hal.changes 2007-09-10 13:08:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-09-20 16:16:22.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 20 14:41:02 CEST 2007 - dmueller(a)suse.de
+
+- fix kded crashes, part one (#326488)
+
+-------------------------------------------------------------------
+Thu Sep 20 12:59:26 CEST 2007 - ro(a)suse.de
+
+- make sure macbook addons are built on x86_64 as well (#325811)
+
+-------------------------------------------------------------------
New:
----
hal-access-deleted-memory.diff
hal-macbook-x86_64.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.o32658/_old 2007-09-20 16:29:31.000000000 +0200
+++ /var/tmp/diff_new_pack.o32658/_new 2007-09-20 16:29:31.000000000 +0200
@@ -19,12 +19,12 @@
%define dbus_version 0.61
%define dbus_release 1
%define hal_info_version 20070831
-URL: http://freedesktop.org/Software/hal
+Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
Version: 0.5.9_git20070831
-Release: 8
-Autoreqprov: on
+Release: 11
+AutoReqProv: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
%ifarch %ix86 x86_64
@@ -119,7 +119,7 @@
%else
Requires: e2fsprogs-devel
%endif
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/Other
#
@@ -245,7 +245,6 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
%if 0%{?suse_version} > 1020
-
%fdupes %{buildroot}
%endif
@@ -323,7 +322,6 @@
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%endif
-
%changelog
* Mon Sep 10 2007 - dkukawka(a)suse.de
- added new patches:
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.o32658/_old 2007-09-20 16:29:31.000000000 +0200
+++ /var/tmp/diff_new_pack.o32658/_new 2007-09-20 16:29:31.000000000 +0200
@@ -19,12 +19,12 @@
%define dbus_version 0.61
%define dbus_release 1
%define hal_info_version 20070831
-URL: http://freedesktop.org/Software/hal
+Url: http://freedesktop.org/Software/hal
License: HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
Version: 0.5.9_git20070831
-Release: 7
-Autoreqprov: on
+Release: 10
+AutoReqProv: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
%ifarch %ix86 x86_64
@@ -74,6 +74,8 @@
Patch101: hal-fix-acpi_on_battery_discharging.diff
Patch102: hal-fix-prevent_eject_method_for_dm-devices.diff
Patch103: hal-add-ThinkPadAcpiEvent_killswitch.diff
+Patch104: hal-access-deleted-memory.diff
+Patch105: hal-macbook-x86_64.diff
# backports from git HEAD:
Patch200: hal-backport-split-luks-policy.diff
# revert from HEAD:
@@ -119,7 +121,7 @@
%else
Requires: e2fsprogs-devel
%endif
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/Other
#
@@ -164,7 +166,9 @@
%patch200 -p1
%patch102 -p1
%patch252 -p1
+%patch105 -p0
%patch103 -p1
+%patch104
#%patch1000 -p1
# patch hal-info package if needed
pushd hal-info-%{hal_info_version}
@@ -245,7 +249,6 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
%if 0%{?suse_version} > 1020
-
%fdupes %{buildroot}
%endif
@@ -323,8 +326,11 @@
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%endif
-
%changelog
+* Thu Sep 20 2007 - dmueller(a)suse.de
+- fix kded crashes, part one (#326488)
+* Thu Sep 20 2007 - ro(a)suse.de
+- make sure macbook addons are built on x86_64 as well (#325811)
* Mon Sep 10 2007 - dkukawka(a)suse.de
- added new patches:
- hal-add-ThinkPadAcpiEvent_killswitch.diff: forward ACPI event
++++++ hal-access-deleted-memory.diff ++++++
--- libhal/libhal.c
+++ libhal/libhal.c
@@ -556,19 +556,21 @@ libhal_property_set_sort (LibHalPropertySet *set)
void
libhal_free_property_set (LibHalPropertySet * set)
{
- LibHalProperty *p;
+ LibHalProperty *p, *p_old;
if (set == NULL)
return;
- for (p = set->properties; p != NULL; p=p->hh.next) {
+ for (p = set->properties; p != NULL;) {
HASH_DELETE (hh, set->properties, p);
free (p->key);
if (p->type == DBUS_TYPE_STRING)
free (p->v.str_value);
if (p->type == LIBHAL_PROPERTY_TYPE_STRLIST)
libhal_free_string_array (p->v.strlist_value);
- free (p);
+ p_old = p;
+ p = p->hh.next;
+ free (p_old);
}
free (set);
}
++++++ hal-macbook-x86_64.diff ++++++
--- configure.in 2007/09/16 23:50:28 1.1
+++ configure.in 2007/09/16 23:50:47
@@ -763,7 +763,7 @@
case "${HALD_BACKEND}" in
linux)
case "${host}" in
- i[[3456]]86-*-*)
+ i[[3456]]86-*-*|x86_64-*-*)
BUILD_MACBOOKPRO=yes
;;
*)
@@ -789,7 +789,7 @@
case "${HALD_BACKEND}" in
linux)
case "${host}" in
- i[[3456]]86-*-*)
+ i[[3456]]86-*-*|x86_64-*-*)
BUILD_MACBOOK=yes
;;
*)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0