Mailinglist Archive: opensuse-commit (1670 mails)
| < Previous | Next > |
commit yast2-storage
- From: root@xxxxxxx (h_root)
- Date: Mon, 2 Oct 2006 15:23:30 +0200 (CEST)
- Message-id: <20061002132330.A172A193CE4@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-storage
checked in at Mon Oct 2 15:23:30 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-09-28 16:42:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2006-10-02 13:47:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 29 14:47:59 CEST 2006 - olh@xxxxxxx
+
+- handle amiga paritition tables for Pegasos2 (#141461/feature #300765)
+- version 2.14.8
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.14.7.tar.bz2
New:
----
yast2-storage-2.14.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.XBdPpd/_old 2006-10-02 15:23:08.000000000 +0200
+++ /var/tmp/diff_new_pack.XBdPpd/_new 2006-10-02 15:23:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.14.7)
+# spec file for package yast2-storage (Version 2.14.8)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.14.7
+Version: 2.14.8
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.14.7.tar.bz2
+Source0: yast2-storage-2.14.8.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.14.7
+%setup -n yast2-storage-2.14.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,6 +165,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog -n yast2-storage
+* Fri Sep 29 2006 - olh@xxxxxxx
+- handle amiga paritition tables for Pegasos2 (#141461/feature #300765)
+- version 2.14.8
* Thu Sep 28 2006 - fehr@xxxxxxx
- add more general fix for bug #202346
- version 2.14.7
++++++ yast2-storage-2.14.7.tar.bz2 -> yast2-storage-2.14.8.tar.bz2 ++++++
++++ 6412 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/Makefile.am new/yast2-storage-2.14.8/Makefile.am
--- old/yast2-storage-2.14.7/Makefile.am 2006-07-13 13:44:08.000000000 +0200
+++ new/yast2-storage-2.14.8/Makefile.am 2006-10-02 13:44:34.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +200,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/VERSION new/yast2-storage-2.14.8/VERSION
--- old/yast2-storage-2.14.7/VERSION 2006-09-28 16:41:47.000000000 +0200
+++ new/yast2-storage-2.14.8/VERSION 2006-10-02 13:12:10.000000000 +0200
@@ -1 +1 @@
-2.14.7
+2.14.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/configure.in new/yast2-storage-2.14.8/configure.in
--- old/yast2-storage-2.14.7/configure.in 2006-07-13 13:44:08.000000000 +0200
+++ new/yast2-storage-2.14.8/configure.in 2006-10-02 13:44:34.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.25 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.14.0, http://www.suse.de/feedback, yast2-storage)
+AC_INIT(yast2-storage, 2.14.8, http://bugs.opensuse.org/, yast2-storage)
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.14.0"
+VERSION="2.14.8"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr <fehr@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/libstorage/src/Disk.cc new/yast2-storage-2.14.8/libstorage/src/Disk.cc
--- old/yast2-storage-2.14.7/libstorage/src/Disk.cc 2006-09-26 18:41:44.000000000 +0200
+++ new/yast2-storage-2.14.8/libstorage/src/Disk.cc 2006-10-02 13:12:06.000000000 +0200
@@ -923,6 +923,8 @@
ret = "sun";
else if( Storage::arch()=="ppc" && Storage::isPPCMac() )
ret = "mac";
+ else if( Storage::arch()=="ppc" && Storage::isPPCPegasos() )
+ ret = "amiga";
y2milestone( "ret:%s", ret.c_str() );
return( ret );
}
@@ -935,6 +937,7 @@
{ "mac", false, 64, 0 },
{ "dasd", false, 3, 0 },
{ "aix", false, 0, 0 },
+ { "amiga", false, 63, 0 },
{ "", false, 0, 0 }
};
@@ -2073,7 +2076,7 @@
y2milestone( "corrected end from %lu to max %lu", end, maxc );
end = maxc;
}
- if( start==0 && label == "mac" )
+ if( start==0 && (label == "mac" || label == "amiga") )
start = 1;
cmd_line << start << " ";
string save = cmd_line.str();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/libstorage/src/Storage.cc new/yast2-storage-2.14.8/libstorage/src/Storage.cc
--- old/yast2-storage-2.14.7/libstorage/src/Storage.cc 2006-09-26 18:57:42.000000000 +0200
+++ new/yast2-storage-2.14.8/libstorage/src/Storage.cc 2006-10-02 13:12:06.000000000 +0200
@@ -350,9 +350,16 @@
line = extractNthWord( 2, line );
y2milestone( "line:%s", line.c_str() );
is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
+ if( is_ppc_mac == 0)
+ {
+ line = cpu[l];
+ line = extractNthWord( 3, line );
+ y2milestone( "line:%s", line.c_str() );
+ is_ppc_pegasos = line.find( "Pegasos" )==0;
+ }
}
}
- y2milestone( "Arch:%s IsPPCMac:%d", proc_arch.c_str(), is_ppc_mac );
+ y2milestone( "Arch:%s IsPPCMac:%d IsPPCPegasos:%d", proc_arch.c_str(), is_ppc_mac, is_ppc_pegasos );
}
void
@@ -941,6 +948,7 @@
string Storage::proc_arch;
string Storage::sysfs_dir = "/sys/block";
bool Storage::is_ppc_mac = false;
+bool Storage::is_ppc_pegasos = false;
namespace storage
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/libstorage/src/Storage.h new/yast2-storage-2.14.8/libstorage/src/Storage.h
--- old/yast2-storage-2.14.7/libstorage/src/Storage.h 2006-09-26 18:30:32.000000000 +0200
+++ new/yast2-storage-2.14.8/libstorage/src/Storage.h 2006-10-02 13:12:06.000000000 +0200
@@ -215,6 +215,7 @@
static const string& arch() { return( proc_arch ); }
static const string& sysfsDir() { return( sysfs_dir ); }
static bool isPPCMac() { return( is_ppc_mac ); }
+ static bool isPPCPegasos() { return( is_ppc_pegasos ); }
EtcFstab* getFstab() { return fstab; }
void handleLogFile( const string& name );
static bool testFilesEqual( const string& n1, const string& n2 );
@@ -1615,6 +1616,7 @@
static string proc_arch;
static string sysfs_dir;
static bool is_ppc_mac;
+ static bool is_ppc_pegasos;
CCont cont;
EtcFstab *fstab;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.7/storage/src/modules/Partitions.ycp new/yast2-storage-2.14.8/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.14.7/storage/src/modules/Partitions.ycp 2006-09-20 12:26:33.000000000 +0200
+++ new/yast2-storage-2.14.8/storage/src/modules/Partitions.ycp 2006-10-02 13:12:09.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 33002 2006-09-20 10:28:09Z fehr $
+ * $Id: Partitions.ycp 33193 2006-09-29 12:47:35Z olh $
*/
{
module "Partitions";
@@ -673,6 +673,7 @@
"max_primary" : 4 ],
"gpt" : $[ "max_primary" : 16 ],
"mac" : $[ "max_primary" : 16 ],
+ "amiga" : $[ "max_primary" : 16 ],
"sun" : $[ "max_primary" : 8 ],
"bsd" : $[ "max_primary" : 8 ],
"dasd" : $[ "max_primary" : 3 ]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |