June 2012 - openSUSE Commits - openSUSE Mailing Lists

commit python-celery for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package python-celery for openSUSE:Factory checked in at 2012-06-29 07:02:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-celery (Old) and /work/SRC/openSUSE:Factory/.python-celery.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-celery", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-celery/python-celery.changes 2012-04-23 09:16:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-celery.new/python-celery.changes 2012-06-29 07:03:01.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jun 28 09:04:40 UTC 2012 - saschpe(a)suse.de + +- Conflict with kombu >= 2.2.0 (see previous changes entry) + +------------------------------------------------------------------- +Wed Jun 6 17:31:29 UTC 2012 - alexandre(a)exatati.com.br + +- Update to 2.5.5: + This is a dummy release performed for the following goals: + - Protect against force upgrading to Kombu 2.2.0 + - Version parity with django-celery + +------------------------------------------------------------------- Old: ---- celery-2.5.3.tar.bz2 New: ---- celery-2.5.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-celery.spec ++++++ --- /var/tmp/diff_new_pack.ZqZSyG/_old 2012-06-29 07:03:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqZSyG/_new 2012-06-29 07:03:02.000000000 +0200 @@ -16,11 +16,8 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: python-celery -Version: 2.5.3 +Version: 2.5.5 Release: 0 Url: http://celeryproject.org Summary: Distributed Task Queue @@ -36,7 +33,7 @@ BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-gevent -BuildRequires: python-kombu >= 2.1.1 +BuildRequires: python-kombu >= 2.1.8 BuildRequires: python-mock BuildRequires: python-nose-cover3 BuildRequires: python-pyOpenSSL @@ -44,12 +41,14 @@ BuildRequires: python-importlib BuildRequires: python-ordereddict BuildRequires: python-unittest2 +# See changes entry from "Jun 6 17:31:29 UTC 2012": +# TODO/FIXME: Drop this as as soon as possible, d:l:p already has a newer kombu, +Conflicts: python-kombu >= 2.2.0 Requires: python-importlib Requires: python-ordereddict %endif Requires: python-anyjson Requires: python-dateutil -Requires: python-kombu >= 2.1.1 Recommends: python-curses Recommends: python-pyOpenSSL Suggests: python-eventlet @@ -57,12 +56,12 @@ Suggests: python-pymongo Suggests: python-python-daemon Suggests: python-pytyrant -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %py_requires -%if 0%{?suse_version} > 1110 +%else BuildArch: noarch %endif -%endif %description Celery is an open source asynchronous task queue/job queue based on ++++++ celery-2.5.3.tar.bz2 -> celery-2.5.5.tar.bz2 ++++++ ++++ 1968 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-CPAN-Meta-Check for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package perl-CPAN-Meta-Check for openSUSE:12.2 checked in at 2012-06-29 07:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/perl-CPAN-Meta-Check (Old) and /work/SRC/openSUSE:12.2/.perl-CPAN-Meta-Check.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CPAN-Meta-Check", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/perl-CPAN-Meta-Check/perl-CPAN-Meta-Check.changes 2012-06-26 17:15:52.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.perl-CPAN-Meta-Check.new/perl-CPAN-Meta-Check.changes 2012-06-29 07:02:01.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 08:27:08 UTC 2012 - coolo(a)suse.com + +- complete the previous change to also respect buildrequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CPAN-Meta-Check.spec ++++++ --- /var/tmp/diff_new_pack.VxY0n7/_old 2012-06-29 07:02:01.000000000 +0200 +++ /var/tmp/diff_new_pack.VxY0n7/_new 2012-06-29 07:02:01.000000000 +0200 @@ -28,7 +28,6 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl-CPAN-Meta >= 2.121 BuildRequires: perl-CPAN-Meta-Requirements >= 2.121 BuildRequires: perl-macros BuildRequires: perl(Module::Metadata) @@ -36,6 +35,7 @@ BuildRequires: perl(Test::More) >= 0.88 #BuildRequires: perl(CPAN::Meta::Check) %if %suse_version < 1220 +BuildRequires: perl-CPAN-Meta >= 2.121 Requires: perl-CPAN-Meta >= 2.121 %endif Requires: perl-CPAN-Meta-Requirements >= 2.121 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-CPAN-Meta-Check for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package perl-CPAN-Meta-Check for openSUSE:Factory checked in at 2012-06-29 07:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CPAN-Meta-Check (Old) and /work/SRC/openSUSE:Factory/.perl-CPAN-Meta-Check.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CPAN-Meta-Check", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CPAN-Meta-Check/perl-CPAN-Meta-Check.changes 2012-06-26 17:15:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-CPAN-Meta-Check.new/perl-CPAN-Meta-Check.changes 2012-06-29 07:01:50.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 08:27:08 UTC 2012 - coolo(a)suse.com + +- complete the previous change to also respect buildrequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CPAN-Meta-Check.spec ++++++ --- /var/tmp/diff_new_pack.44ZvlH/_old 2012-06-29 07:01:51.000000000 +0200 +++ /var/tmp/diff_new_pack.44ZvlH/_new 2012-06-29 07:01:51.000000000 +0200 @@ -28,7 +28,6 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl-CPAN-Meta >= 2.121 BuildRequires: perl-CPAN-Meta-Requirements >= 2.121 BuildRequires: perl-macros BuildRequires: perl(Module::Metadata) @@ -36,6 +35,7 @@ BuildRequires: perl(Test::More) >= 0.88 #BuildRequires: perl(CPAN::Meta::Check) %if %suse_version < 1220 +BuildRequires: perl-CPAN-Meta >= 2.121 Requires: perl-CPAN-Meta >= 2.121 %endif Requires: perl-CPAN-Meta-Requirements >= 2.121 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pciutils-ids for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package pciutils-ids for openSUSE:12.2 checked in at 2012-06-29 07:01:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/pciutils-ids (Old) and /work/SRC/openSUSE:12.2/.pciutils-ids.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pciutils-ids", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/pciutils-ids/pciutils-ids.changes 2012-06-25 15:48:22.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.pciutils-ids.new/pciutils-ids.changes 2012-06-29 07:01:45.000000000 +0200 @@ -2 +2 @@ -Thu Jun 21 17:11:33 CEST 2012 - autobuild(a)suse.de +Thu Jun 28 17:40:07 CEST 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-06-21 +- automated update on 2012-06-28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.jkVY5i/_old 2012-06-29 07:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.jkVY5i/_new 2012-06-29 07:01:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: pciutils-ids -Version: 2012.5.7 +Version: 2012.6.25 Release: 0 Summary: PCI-utilities pci.ids database License: GPL-2.0+ ++++++ pci.ids.bz2 ++++++ ++++ 941 lines (skipped) ++++ between pci.ids.bz2 ++++ and /work/SRC/openSUSE:12.2/.pciutils-ids.new/pci.ids.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pciutils-ids for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package pciutils-ids for openSUSE:Factory checked in at 2012-06-29 07:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils-ids (Old) and /work/SRC/openSUSE:Factory/.pciutils-ids.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pciutils-ids", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils-ids/pciutils-ids.changes 2012-06-25 14:31:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pciutils-ids.new/pciutils-ids.changes 2012-06-29 07:01:43.000000000 +0200 @@ -2 +2 @@ -Thu Jun 21 17:11:33 CEST 2012 - autobuild(a)suse.de +Thu Jun 28 17:40:07 CEST 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-06-21 +- automated update on 2012-06-28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.DXnF4e/_old 2012-06-29 07:01:45.000000000 +0200 +++ /var/tmp/diff_new_pack.DXnF4e/_new 2012-06-29 07:01:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: pciutils-ids -Version: 2012.5.7 +Version: 2012.6.25 Release: 0 Summary: PCI-utilities pci.ids database License: GPL-2.0+ ++++++ pci.ids.bz2 ++++++ ++++ 941 lines (skipped) ++++ between pci.ids.bz2 ++++ and /work/SRC/openSUSE:Factory/.pciutils-ids.new/pci.ids.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package libstorage for openSUSE:12.2 checked in at 2012-06-29 07:00:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libstorage (Old) and /work/SRC/openSUSE:12.2/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/libstorage/libstorage.changes 2012-06-25 15:45:13.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libstorage.new/libstorage.changes 2012-06-29 07:00:57.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 27 15:13:23 CEST 2012 - fehr(a)suse.de + +- 2.22.7 +- add function to replace complete list of md component devices + +------------------------------------------------------------------- +Tue Jun 26 19:05:26 CEST 2012 - fehr(a)suse.de + +- suppress helper dm maps for lvm pool and lvm raid volumes + +------------------------------------------------------------------- Old: ---- libstorage-2.22.6.tar.bz2 New: ---- libstorage-2.22.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.pmMnlO/_old 2012-06-29 07:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.pmMnlO/_new 2012-06-29 07:00:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.22.6 +Version: 2.22.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.22.6.tar.bz2 -> libstorage-2.22.7.tar.bz2 ++++++ ++++ 17179 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/libstorage-2.22.6/VERSION new/libstorage-2.22.7/VERSION --- old/libstorage-2.22.6/VERSION 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/VERSION 2012-06-28 16:32:05.000000000 +0200 @@ -1 +1 @@ -2.22.6 +2.22.7 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/libstorage-2.22.6/bindings/python/libstorage.py new/libstorage-2.22.7/bindings/python/libstorage.py --- old/libstorage-2.22.6/bindings/python/libstorage.py 2012-06-19 11:11:40.000000000 +0200 +++ new/libstorage-2.22.7/bindings/python/libstorage.py 2012-06-25 12:47:06.000000000 +0200 @@ -1,9 +1,10 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.40 +# Version 2.0.4 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. -# This file is compatible with both classic and new-style classes. + + from sys import version_info if version_info >= (2,6,0): @@ -39,7 +40,7 @@ return method = class_type.__swig_setmethods__.get(name,None) if method: return method(self,value) - if (not static) or hasattr(self,name): + if (not static): self.__dict__[name] = value else: raise AttributeError("You cannot add attributes to %s" % self) @@ -1614,6 +1615,7 @@ def createMdAny(self, *args): return _libstorage.StorageInterface_createMdAny(self, *args) def removeMd(self, *args): return _libstorage.StorageInterface_removeMd(self, *args) def extendMd(self, *args): return _libstorage.StorageInterface_extendMd(self, *args) + def updateMd(self, *args): return _libstorage.StorageInterface_updateMd(self, *args) def shrinkMd(self, *args): return _libstorage.StorageInterface_shrinkMd(self, *args) def changeMdType(self, *args): return _libstorage.StorageInterface_changeMdType(self, *args) def changeMdChunk(self, *args): return _libstorage.StorageInterface_changeMdChunk(self, *args) @@ -1993,5 +1995,6 @@ dequelvmlvinfo_swigregister = _libstorage.dequelvmlvinfo_swigregister dequelvmlvinfo_swigregister(dequelvmlvinfo) +# This file is compatible with both classic and new-style classes. 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/libstorage-2.22.6/examples/Makefile.example new/libstorage-2.22.7/examples/Makefile.example --- old/libstorage-2.22.6/examples/Makefile.example 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/examples/Makefile.example 2012-06-26 16:31:32.000000000 +0200 @@ -2,31 +2,33 @@ PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop \ SaveGraph ShowBytes +CPPFLAGS=-std=c++0x + all: $(PROGRAMS) TestDisk: TestDisk.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestDiskLog: TestDiskLog.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestProbing: TestProbing.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestLvm: TestLvm.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestMd: TestMd.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestLoop: TestLoop.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage SaveGraph: SaveGraph.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage ShowBytes: ShowBytes.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage clean: rm $(PROGRAMS) 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/libstorage-2.22.6/storage/AppUtil.cc new/libstorage-2.22.7/storage/AppUtil.cc --- old/libstorage-2.22.6/storage/AppUtil.cc 2012-06-19 12:08:57.000000000 +0200 +++ new/libstorage-2.22.7/storage/AppUtil.cc 2012-06-19 16:35:26.000000000 +0200 @@ -392,8 +392,11 @@ if( !logf ) { logf = fopen(filename.c_str(), "a"); - setlinebuf(logf); - atexit( close_logf ); + if( logf ) + { + setlinebuf(logf); + atexit( close_logf ); + } } string::size_type pos1 = 0; @@ -691,6 +694,7 @@ #include "./gen_pathlist.cc" }; ign.push_back( PORTMAPBIN ); + ign.push_back( HFORMATBIN ); if( !boost::starts_with(arch,"s390") ) { ign.push_back( FDASDBIN ); 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/libstorage-2.22.6/storage/Dm.cc new/libstorage-2.22.7/storage/Dm.cc --- old/libstorage-2.22.6/storage/Dm.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/Dm.cc 2012-06-26 18:40:26.000000000 +0200 @@ -486,6 +486,21 @@ return( ret ); } +string Dm::lvmTableToDev( const string& tab ) + { + static Regex delim( "[^-]-[^-]" ); + string ret( tab ); + if( delim.match( ret ) ) + { + ret[delim.so(0)+1] = '/'; + boost::replace_all(ret,"--","-"); + ret = "/dev/" + ret; + } + return( ret ); + } + + + string Dm::dmDeviceName( unsigned long num ) { 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/libstorage-2.22.6/storage/Dm.h new/libstorage-2.22.7/storage/Dm.h --- old/libstorage-2.22.6/storage/Dm.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/Dm.h 2012-06-26 18:37:17.000000000 +0200 @@ -84,6 +84,7 @@ static bool isActive() { return active; } static string devToTable( const string& dev ); + static string lvmTableToDev( const string& table ); virtual list<string> getUsing() const; 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/libstorage-2.22.6/storage/DmCo.cc new/libstorage-2.22.7/storage/DmCo.cc --- old/libstorage-2.22.6/storage/DmCo.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/DmCo.cc 2012-06-26 19:02:55.000000000 +0200 @@ -192,6 +192,26 @@ Storage::ConstDmmultipathPair dmm = getStorage()->dmmPair(); const CmdDmsetup& cmddmsetup = systeminfo.getCmdDmsetup(); + list<string> lvm_pools; + for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + { + if( boost::ends_with(it1->first,"-tpool") ) + { + string name = it1->first.substr( 0, it1->first.size()-6 ); + if( find( lvm_pools.begin(), lvm_pools.end(), name )==lvm_pools.end() ) + { + string tb = it1->first; + Dm* m = new Dm(*this, tb, "/dev/mapper/" + tb, tb, systeminfo); + if( m && m->getTargetName()=="thin-pool" ) + { + lvm_pools.push_back( name ); + } + if(m) + delete(m); + } + } + } + y2mil( "lvm_pools:" << lvm_pools ); for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) { string table = it1->first; @@ -281,23 +301,39 @@ if (getStorage()->isUsedBy(it->first, UB_DM)) getStorage()->clearUsedBy(it->first); } + static Regex raid1( "_rimage_[0-9]+$" ); + static Regex raid2( "_rmeta_[0-9]+$" ); + if( !skip && (raid1.match(table)||raid2.match(table))) + { + string::size_type off = std::max( raid1.so(0), raid2.so(0) ); + string nm = Dm::lvmTableToDev( table.substr( 0, off ) ); + skip = getStorage()->knownDevice( nm ); + y2mil( "raid table:" << table << " name:" << nm << " skip:" << skip ); + } + if( !skip && (boost::ends_with(table,"-tpool")|| + boost::ends_with(table,"_tdata")|| + boost::ends_with(table,"_tmeta"))) + { + string nm = table.substr( 0, table.size()-6 ); + skip = find( lvm_pools.begin(), lvm_pools.end(), nm )!=lvm_pools.end(); + y2mil( "pool table:" << table << " name:" << nm << " skip:" << skip ); + } + if( !skip ) + { + skip = find( lvm_pools.begin(), lvm_pools.end(), table )!=lvm_pools.end(); + y2mil( "pool table:" << table << " skip:" << skip ); + } if( !skip && (boost::ends_with(table,"-real")|| boost::ends_with(table,"-cow"))) { - static Regex delim( "[^-]-[^-]" ); string on = table; if( boost::ends_with(on,"-real")) on.erase( on.size()-5 ); if( boost::ends_with(tmp,"-cow")) on.erase( on.size()-4 ); - if( delim.match( on ) ) - { - on[delim.so(0)+1] = '/'; - boost::replace_all(on,"--","-"); - on = "/dev/" + on; - skip = getStorage()->knownDevice( on ); - y2mil( "devname:" << on << " skip:" << skip ); - } + on = Dm::lvmTableToDev( on ); + skip = getStorage()->knownDevice( on ); + y2mil( "snap devname:" << on << " skip:" << skip ); } if (!skip && m->sizeK()>0 && !only_crypt ) addDm( m ); 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/libstorage-2.22.6/storage/LvmVg.cc new/libstorage-2.22.7/storage/LvmVg.cc --- old/libstorage-2.22.6/storage/LvmVg.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/LvmVg.cc 2012-06-26 17:46:39.000000000 +0200 @@ -772,16 +772,18 @@ unsigned long num_le = 0; unsigned long num_cow_le = 0; bool readOnly = false; + bool pool = false; while( line.find( "Physical volume" )==string::npos && i<cnt ) { line.erase( 0, line.find_first_not_of( app_ws )); if( line.find( "LV Name" ) == 0 ) { - if( !vname.empty() ) + if( !vname.empty() && !pool ) { addLv(origin.empty() ? num_le : num_cow_le, vname, origin, uuid, status, allocation, readOnly); } + pool = false; vname = extractNthWord( 2, line ); if( (pos=vname.rfind( "/" ))!=string::npos ) vname.erase( 0, pos+1 ); @@ -820,9 +822,13 @@ { uuid = extractNthWord( 2, line ); } + else if( line.find( "LV Pool metadata" ) == 0 ) + { + pool = true; + } line = c.getLine( i++ ); } - if( !vname.empty() ) + if( !vname.empty() && !pool ) { addLv(origin.empty() ? num_le : num_cow_le, vname, origin, uuid, status, allocation, readOnly); } 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/libstorage-2.22.6/storage/MdCo.cc new/libstorage-2.22.7/storage/MdCo.cc --- old/libstorage-2.22.6/storage/MdCo.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/MdCo.cc 2012-06-21 19:04:21.000000000 +0200 @@ -279,6 +279,56 @@ } int +MdCo::updateMd(unsigned num, const list<string>& devs, const list<string>& spares) + { + int ret = 0; + y2mil("num:" << num << " devs:" << devs << " spares:" << spares); + MdIter i; + if( readonly() ) + { + ret = MD_CHANGE_READONLY; + } + if( ret==0 ) + { + if( !findMd( num, i )) + ret = MD_UNKNOWN_NUMBER; + } + if( ret==0 && !i->created() ) + { + ret = MD_NO_RESIZE_ON_DISK; + } + if( ret==0 ) + { + list<string> ls = i->getDevs(); + for( list<string>::const_iterator it=ls.begin(); it!=ls.end(); ++it ) + if ((ret = i->removeDevice(*it)) != 0) + break; + } + if( ret==0 ) + { + ret = checkUse(devs, spares); + } + if( ret==0 ) + { + for (list<string>::const_iterator it = devs.begin(); it != devs.end(); ++it) + if ((ret = i->addDevice(*it)) != 0) + break; + } + if( ret==0 ) + { + for (list<string>::const_iterator it = spares.begin(); it != spares.end(); ++it) + if ((ret = i->addDevice(*it, true)) != 0) + break; + } + if( ret==0 && !getStorage()->isDisk(dev) ) + { + getStorage()->changeFormatVolume( dev, false, FSNONE ); + } + y2mil("ret:" << ret); + return( ret ); + } + +int MdCo::shrinkMd(unsigned num, const list<string>& devs, const list<string>& spares) { int ret = 0; 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/libstorage-2.22.6/storage/MdCo.h new/libstorage-2.22.7/storage/MdCo.h --- old/libstorage-2.22.6/storage/MdCo.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/MdCo.h 2012-06-21 18:53:24.000000000 +0200 @@ -48,6 +48,7 @@ int createMd(unsigned num, MdType type, const list<string>& devs, const list<string>& spares); int removeMd( unsigned num, bool destroySb=true ); int extendMd(unsigned num, const list<string>& devs, const list<string>& spares); + int updateMd(unsigned num, const list<string>& devs, const list<string>& spares); int shrinkMd(unsigned num, const list<string>& devs, const list<string>& spares); int changeMdType( unsigned num, storage::MdType ptype ); int changeMdChunk( unsigned num, unsigned long chunk ); 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/libstorage-2.22.6/storage/Storage.cc new/libstorage-2.22.7/storage/Storage.cc --- old/libstorage-2.22.6/storage/Storage.cc 2012-06-19 12:04:13.000000000 +0200 +++ new/libstorage-2.22.7/storage/Storage.cc 2012-06-21 18:52:59.000000000 +0200 @@ -3931,6 +3931,36 @@ return( ret ); } +int Storage::updateMd(const string& name, const list<string>& devs, const list<string>& spares) + { + int ret = 0; + assertInit(); + y2mil("name:" << name << " devs:" << devs << " spares:" << spares); + if (readonly()) + { + ret = STORAGE_CHANGE_READONLY; + } + unsigned num = 0; + if( ret==0 && !Md::mdStringNum( name, num )) + { + ret = STORAGE_MD_INVALID_NAME; + } + if( ret==0 ) + { + MdCo *md = NULL; + if( haveMd(md) ) + ret = md->updateMd(num, normalizeDevices(devs), normalizeDevices(spares)); + else + ret = STORAGE_MD_NOT_FOUND; + } + if( ret==0 ) + { + ret = checkCache(); + } + y2mil("ret:" << ret); + return( ret ); + } + int Storage::shrinkMd(const string& name, const list<string>& devs, const list<string>& spares) { int ret = 0; 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/libstorage-2.22.6/storage/Storage.h new/libstorage-2.22.7/storage/Storage.h --- old/libstorage-2.22.6/storage/Storage.h 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/storage/Storage.h 2012-06-21 18:52:10.000000000 +0200 @@ -513,6 +513,7 @@ string& device); int removeMd( const string& name, bool destroySb=true ); int extendMd(const string& name, const list<string>& devs, const list<string>& spares); + int updateMd(const string& name, const list<string>& devs, const list<string>& spares); int shrinkMd(const string& name, const list<string>& devs, const list<string>& spares); int changeMdType( const string& name, storage::MdType rtype ); int changeMdChunk( const string& name, unsigned long chunk ); 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/libstorage-2.22.6/storage/StorageDefines.h new/libstorage-2.22.7/storage/StorageDefines.h --- old/libstorage-2.22.6/storage/StorageDefines.h 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/storage/StorageDefines.h 2012-06-19 12:37:19.000000000 +0200 @@ -82,7 +82,6 @@ #define UDEVADMBIN "/sbin/udevadm" #define MODPROBEBIN "/sbin/modprobe" -#define PSBIN "/bin/ps" #define GREPBIN "/usr/bin/grep" #define PORTMAPBIN "/sbin/portmap" #define RPCBINDBIN "/sbin/rpcbind" 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/libstorage-2.22.6/storage/StorageInterface.h new/libstorage-2.22.7/storage/StorageInterface.h --- old/libstorage-2.22.6/storage/StorageInterface.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/StorageInterface.h 2012-06-21 18:51:23.000000000 +0200 @@ -2070,6 +2070,18 @@ const list<string>& spares) = 0; /** + * Update all partitions of a raid device. + * This can only be done before the raid is created on disk. + * + * @param name name of software raid device (e.g. /dev/md0) + * @param devices list with physical devices to create the raid with + * @param spares list with spare physical devices to create the raid with + * @return zero if all is ok, a negative number to indicate an error + */ + virtual int updateMd(const string& name, const list<string>& devices, + const list<string>& spares) = 0; + + /** * Remove a partition from a raid device. * This can only be done before the raid is created on disk. * @@ -2741,7 +2753,7 @@ */ struct Environment { - Environment(bool readonly, string logdr="/var/log/YaST2") : readonly(readonly), testmode(false), autodetect(true), + Environment(bool readonly, const string& logdr="/var/log/YaST2") : readonly(readonly), testmode(false), autodetect(true), instsys(false), logdir(logdr), testdir("tmp") { storage::initDefaultLogger( logdir ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2012-06-29 07:00:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2012-06-25 12:35:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2012-06-29 07:00:51.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 27 15:13:23 CEST 2012 - fehr(a)suse.de + +- 2.22.7 +- add function to replace complete list of md component devices + +------------------------------------------------------------------- +Tue Jun 26 19:05:26 CEST 2012 - fehr(a)suse.de + +- suppress helper dm maps for lvm pool and lvm raid volumes + +------------------------------------------------------------------- Old: ---- libstorage-2.22.6.tar.bz2 New: ---- libstorage-2.22.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.Wqn4x9/_old 2012-06-29 07:00:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Wqn4x9/_new 2012-06-29 07:00:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.22.6 +Version: 2.22.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.22.6.tar.bz2 -> libstorage-2.22.7.tar.bz2 ++++++ ++++ 17179 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/libstorage-2.22.6/VERSION new/libstorage-2.22.7/VERSION --- old/libstorage-2.22.6/VERSION 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/VERSION 2012-06-28 16:32:05.000000000 +0200 @@ -1 +1 @@ -2.22.6 +2.22.7 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/libstorage-2.22.6/bindings/python/libstorage.py new/libstorage-2.22.7/bindings/python/libstorage.py --- old/libstorage-2.22.6/bindings/python/libstorage.py 2012-06-19 11:11:40.000000000 +0200 +++ new/libstorage-2.22.7/bindings/python/libstorage.py 2012-06-25 12:47:06.000000000 +0200 @@ -1,9 +1,10 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 1.3.40 +# Version 2.0.4 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. -# This file is compatible with both classic and new-style classes. + + from sys import version_info if version_info >= (2,6,0): @@ -39,7 +40,7 @@ return method = class_type.__swig_setmethods__.get(name,None) if method: return method(self,value) - if (not static) or hasattr(self,name): + if (not static): self.__dict__[name] = value else: raise AttributeError("You cannot add attributes to %s" % self) @@ -1614,6 +1615,7 @@ def createMdAny(self, *args): return _libstorage.StorageInterface_createMdAny(self, *args) def removeMd(self, *args): return _libstorage.StorageInterface_removeMd(self, *args) def extendMd(self, *args): return _libstorage.StorageInterface_extendMd(self, *args) + def updateMd(self, *args): return _libstorage.StorageInterface_updateMd(self, *args) def shrinkMd(self, *args): return _libstorage.StorageInterface_shrinkMd(self, *args) def changeMdType(self, *args): return _libstorage.StorageInterface_changeMdType(self, *args) def changeMdChunk(self, *args): return _libstorage.StorageInterface_changeMdChunk(self, *args) @@ -1993,5 +1995,6 @@ dequelvmlvinfo_swigregister = _libstorage.dequelvmlvinfo_swigregister dequelvmlvinfo_swigregister(dequelvmlvinfo) +# This file is compatible with both classic and new-style classes. 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/libstorage-2.22.6/examples/Makefile.example new/libstorage-2.22.7/examples/Makefile.example --- old/libstorage-2.22.6/examples/Makefile.example 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/examples/Makefile.example 2012-06-26 16:31:32.000000000 +0200 @@ -2,31 +2,33 @@ PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop \ SaveGraph ShowBytes +CPPFLAGS=-std=c++0x + all: $(PROGRAMS) TestDisk: TestDisk.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestDiskLog: TestDiskLog.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestProbing: TestProbing.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestLvm: TestLvm.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestMd: TestMd.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage TestLoop: TestLoop.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage SaveGraph: SaveGraph.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage ShowBytes: ShowBytes.cc - g++ $< -o $@ -Wall -O2 -lstorage + g++ $(CPPFLAGS) $< -o $@ -Wall -O2 -lstorage clean: rm $(PROGRAMS) 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/libstorage-2.22.6/storage/AppUtil.cc new/libstorage-2.22.7/storage/AppUtil.cc --- old/libstorage-2.22.6/storage/AppUtil.cc 2012-06-19 12:08:57.000000000 +0200 +++ new/libstorage-2.22.7/storage/AppUtil.cc 2012-06-19 16:35:26.000000000 +0200 @@ -392,8 +392,11 @@ if( !logf ) { logf = fopen(filename.c_str(), "a"); - setlinebuf(logf); - atexit( close_logf ); + if( logf ) + { + setlinebuf(logf); + atexit( close_logf ); + } } string::size_type pos1 = 0; @@ -691,6 +694,7 @@ #include "./gen_pathlist.cc" }; ign.push_back( PORTMAPBIN ); + ign.push_back( HFORMATBIN ); if( !boost::starts_with(arch,"s390") ) { ign.push_back( FDASDBIN ); 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/libstorage-2.22.6/storage/Dm.cc new/libstorage-2.22.7/storage/Dm.cc --- old/libstorage-2.22.6/storage/Dm.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/Dm.cc 2012-06-26 18:40:26.000000000 +0200 @@ -486,6 +486,21 @@ return( ret ); } +string Dm::lvmTableToDev( const string& tab ) + { + static Regex delim( "[^-]-[^-]" ); + string ret( tab ); + if( delim.match( ret ) ) + { + ret[delim.so(0)+1] = '/'; + boost::replace_all(ret,"--","-"); + ret = "/dev/" + ret; + } + return( ret ); + } + + + string Dm::dmDeviceName( unsigned long num ) { 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/libstorage-2.22.6/storage/Dm.h new/libstorage-2.22.7/storage/Dm.h --- old/libstorage-2.22.6/storage/Dm.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/Dm.h 2012-06-26 18:37:17.000000000 +0200 @@ -84,6 +84,7 @@ static bool isActive() { return active; } static string devToTable( const string& dev ); + static string lvmTableToDev( const string& table ); virtual list<string> getUsing() const; 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/libstorage-2.22.6/storage/DmCo.cc new/libstorage-2.22.7/storage/DmCo.cc --- old/libstorage-2.22.6/storage/DmCo.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/DmCo.cc 2012-06-26 19:02:55.000000000 +0200 @@ -192,6 +192,26 @@ Storage::ConstDmmultipathPair dmm = getStorage()->dmmPair(); const CmdDmsetup& cmddmsetup = systeminfo.getCmdDmsetup(); + list<string> lvm_pools; + for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + { + if( boost::ends_with(it1->first,"-tpool") ) + { + string name = it1->first.substr( 0, it1->first.size()-6 ); + if( find( lvm_pools.begin(), lvm_pools.end(), name )==lvm_pools.end() ) + { + string tb = it1->first; + Dm* m = new Dm(*this, tb, "/dev/mapper/" + tb, tb, systeminfo); + if( m && m->getTargetName()=="thin-pool" ) + { + lvm_pools.push_back( name ); + } + if(m) + delete(m); + } + } + } + y2mil( "lvm_pools:" << lvm_pools ); for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) { string table = it1->first; @@ -281,23 +301,39 @@ if (getStorage()->isUsedBy(it->first, UB_DM)) getStorage()->clearUsedBy(it->first); } + static Regex raid1( "_rimage_[0-9]+$" ); + static Regex raid2( "_rmeta_[0-9]+$" ); + if( !skip && (raid1.match(table)||raid2.match(table))) + { + string::size_type off = std::max( raid1.so(0), raid2.so(0) ); + string nm = Dm::lvmTableToDev( table.substr( 0, off ) ); + skip = getStorage()->knownDevice( nm ); + y2mil( "raid table:" << table << " name:" << nm << " skip:" << skip ); + } + if( !skip && (boost::ends_with(table,"-tpool")|| + boost::ends_with(table,"_tdata")|| + boost::ends_with(table,"_tmeta"))) + { + string nm = table.substr( 0, table.size()-6 ); + skip = find( lvm_pools.begin(), lvm_pools.end(), nm )!=lvm_pools.end(); + y2mil( "pool table:" << table << " name:" << nm << " skip:" << skip ); + } + if( !skip ) + { + skip = find( lvm_pools.begin(), lvm_pools.end(), table )!=lvm_pools.end(); + y2mil( "pool table:" << table << " skip:" << skip ); + } if( !skip && (boost::ends_with(table,"-real")|| boost::ends_with(table,"-cow"))) { - static Regex delim( "[^-]-[^-]" ); string on = table; if( boost::ends_with(on,"-real")) on.erase( on.size()-5 ); if( boost::ends_with(tmp,"-cow")) on.erase( on.size()-4 ); - if( delim.match( on ) ) - { - on[delim.so(0)+1] = '/'; - boost::replace_all(on,"--","-"); - on = "/dev/" + on; - skip = getStorage()->knownDevice( on ); - y2mil( "devname:" << on << " skip:" << skip ); - } + on = Dm::lvmTableToDev( on ); + skip = getStorage()->knownDevice( on ); + y2mil( "snap devname:" << on << " skip:" << skip ); } if (!skip && m->sizeK()>0 && !only_crypt ) addDm( m ); 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/libstorage-2.22.6/storage/LvmVg.cc new/libstorage-2.22.7/storage/LvmVg.cc --- old/libstorage-2.22.6/storage/LvmVg.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/LvmVg.cc 2012-06-26 17:46:39.000000000 +0200 @@ -772,16 +772,18 @@ unsigned long num_le = 0; unsigned long num_cow_le = 0; bool readOnly = false; + bool pool = false; while( line.find( "Physical volume" )==string::npos && i<cnt ) { line.erase( 0, line.find_first_not_of( app_ws )); if( line.find( "LV Name" ) == 0 ) { - if( !vname.empty() ) + if( !vname.empty() && !pool ) { addLv(origin.empty() ? num_le : num_cow_le, vname, origin, uuid, status, allocation, readOnly); } + pool = false; vname = extractNthWord( 2, line ); if( (pos=vname.rfind( "/" ))!=string::npos ) vname.erase( 0, pos+1 ); @@ -820,9 +822,13 @@ { uuid = extractNthWord( 2, line ); } + else if( line.find( "LV Pool metadata" ) == 0 ) + { + pool = true; + } line = c.getLine( i++ ); } - if( !vname.empty() ) + if( !vname.empty() && !pool ) { addLv(origin.empty() ? num_le : num_cow_le, vname, origin, uuid, status, allocation, readOnly); } 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/libstorage-2.22.6/storage/MdCo.cc new/libstorage-2.22.7/storage/MdCo.cc --- old/libstorage-2.22.6/storage/MdCo.cc 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/MdCo.cc 2012-06-21 19:04:21.000000000 +0200 @@ -279,6 +279,56 @@ } int +MdCo::updateMd(unsigned num, const list<string>& devs, const list<string>& spares) + { + int ret = 0; + y2mil("num:" << num << " devs:" << devs << " spares:" << spares); + MdIter i; + if( readonly() ) + { + ret = MD_CHANGE_READONLY; + } + if( ret==0 ) + { + if( !findMd( num, i )) + ret = MD_UNKNOWN_NUMBER; + } + if( ret==0 && !i->created() ) + { + ret = MD_NO_RESIZE_ON_DISK; + } + if( ret==0 ) + { + list<string> ls = i->getDevs(); + for( list<string>::const_iterator it=ls.begin(); it!=ls.end(); ++it ) + if ((ret = i->removeDevice(*it)) != 0) + break; + } + if( ret==0 ) + { + ret = checkUse(devs, spares); + } + if( ret==0 ) + { + for (list<string>::const_iterator it = devs.begin(); it != devs.end(); ++it) + if ((ret = i->addDevice(*it)) != 0) + break; + } + if( ret==0 ) + { + for (list<string>::const_iterator it = spares.begin(); it != spares.end(); ++it) + if ((ret = i->addDevice(*it, true)) != 0) + break; + } + if( ret==0 && !getStorage()->isDisk(dev) ) + { + getStorage()->changeFormatVolume( dev, false, FSNONE ); + } + y2mil("ret:" << ret); + return( ret ); + } + +int MdCo::shrinkMd(unsigned num, const list<string>& devs, const list<string>& spares) { int ret = 0; 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/libstorage-2.22.6/storage/MdCo.h new/libstorage-2.22.7/storage/MdCo.h --- old/libstorage-2.22.6/storage/MdCo.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/MdCo.h 2012-06-21 18:53:24.000000000 +0200 @@ -48,6 +48,7 @@ int createMd(unsigned num, MdType type, const list<string>& devs, const list<string>& spares); int removeMd( unsigned num, bool destroySb=true ); int extendMd(unsigned num, const list<string>& devs, const list<string>& spares); + int updateMd(unsigned num, const list<string>& devs, const list<string>& spares); int shrinkMd(unsigned num, const list<string>& devs, const list<string>& spares); int changeMdType( unsigned num, storage::MdType ptype ); int changeMdChunk( unsigned num, unsigned long chunk ); 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/libstorage-2.22.6/storage/Storage.cc new/libstorage-2.22.7/storage/Storage.cc --- old/libstorage-2.22.6/storage/Storage.cc 2012-06-19 12:04:13.000000000 +0200 +++ new/libstorage-2.22.7/storage/Storage.cc 2012-06-21 18:52:59.000000000 +0200 @@ -3931,6 +3931,36 @@ return( ret ); } +int Storage::updateMd(const string& name, const list<string>& devs, const list<string>& spares) + { + int ret = 0; + assertInit(); + y2mil("name:" << name << " devs:" << devs << " spares:" << spares); + if (readonly()) + { + ret = STORAGE_CHANGE_READONLY; + } + unsigned num = 0; + if( ret==0 && !Md::mdStringNum( name, num )) + { + ret = STORAGE_MD_INVALID_NAME; + } + if( ret==0 ) + { + MdCo *md = NULL; + if( haveMd(md) ) + ret = md->updateMd(num, normalizeDevices(devs), normalizeDevices(spares)); + else + ret = STORAGE_MD_NOT_FOUND; + } + if( ret==0 ) + { + ret = checkCache(); + } + y2mil("ret:" << ret); + return( ret ); + } + int Storage::shrinkMd(const string& name, const list<string>& devs, const list<string>& spares) { int ret = 0; 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/libstorage-2.22.6/storage/Storage.h new/libstorage-2.22.7/storage/Storage.h --- old/libstorage-2.22.6/storage/Storage.h 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/storage/Storage.h 2012-06-21 18:52:10.000000000 +0200 @@ -513,6 +513,7 @@ string& device); int removeMd( const string& name, bool destroySb=true ); int extendMd(const string& name, const list<string>& devs, const list<string>& spares); + int updateMd(const string& name, const list<string>& devs, const list<string>& spares); int shrinkMd(const string& name, const list<string>& devs, const list<string>& spares); int changeMdType( const string& name, storage::MdType rtype ); int changeMdChunk( const string& name, unsigned long chunk ); 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/libstorage-2.22.6/storage/StorageDefines.h new/libstorage-2.22.7/storage/StorageDefines.h --- old/libstorage-2.22.6/storage/StorageDefines.h 2012-06-19 11:07:17.000000000 +0200 +++ new/libstorage-2.22.7/storage/StorageDefines.h 2012-06-19 12:37:19.000000000 +0200 @@ -82,7 +82,6 @@ #define UDEVADMBIN "/sbin/udevadm" #define MODPROBEBIN "/sbin/modprobe" -#define PSBIN "/bin/ps" #define GREPBIN "/usr/bin/grep" #define PORTMAPBIN "/sbin/portmap" #define RPCBINDBIN "/sbin/rpcbind" 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/libstorage-2.22.6/storage/StorageInterface.h new/libstorage-2.22.7/storage/StorageInterface.h --- old/libstorage-2.22.6/storage/StorageInterface.h 2012-06-14 11:03:35.000000000 +0200 +++ new/libstorage-2.22.7/storage/StorageInterface.h 2012-06-21 18:51:23.000000000 +0200 @@ -2070,6 +2070,18 @@ const list<string>& spares) = 0; /** + * Update all partitions of a raid device. + * This can only be done before the raid is created on disk. + * + * @param name name of software raid device (e.g. /dev/md0) + * @param devices list with physical devices to create the raid with + * @param spares list with spare physical devices to create the raid with + * @return zero if all is ok, a negative number to indicate an error + */ + virtual int updateMd(const string& name, const list<string>& devices, + const list<string>& spares) = 0; + + /** * Remove a partition from a raid device. * This can only be done before the raid is created on disk. * @@ -2741,7 +2753,7 @@ */ struct Environment { - Environment(bool readonly, string logdr="/var/log/YaST2") : readonly(readonly), testmode(false), autodetect(true), + Environment(bool readonly, const string& logdr="/var/log/YaST2") : readonly(readonly), testmode(false), autodetect(true), instsys(false), logdir(logdr), testdir("tmp") { storage::initDefaultLogger( logdir ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kcm-fcitx for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package kcm-fcitx for openSUSE:Factory checked in at 2012-06-29 07:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm-fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcm-fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kcm-fcitx/kcm-fcitx.changes 2012-06-10 21:51:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcm-fcitx.new/kcm-fcitx.changes 2012-06-29 07:00:14.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 25 11:32:59 UTC 2012 - i(a)marguerite.su + +- fix fedora builds. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.GfbiBr/_old 2012-06-29 07:00:18.000000000 +0200 +++ /var/tmp/diff_new_pack.GfbiBr/_new 2012-06-29 07:00:18.000000000 +0200 @@ -30,18 +30,28 @@ Obsoletes: %{name} < 0.2.0 Provides: %{name} = %{version} BuildRequires: fcitx-devel +%if 0%{?suse_version} BuildRequires: libkde4-devel %if 0%{?suse_version} <= 1140 BuildRequires: libunique-devel %else BuildRequires: libunique1-devel %endif +%else +BuildRequires: kdelibs-devel +BuildRequires: unique-devel +BuildRequires: libX11-devel +%endif BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libtool -BuildRequires: update-desktop-files +%if 0%{?suse_version} %kde4_runtime_requires +%else +Requires: kde-runtime +Requires: qt-x11 +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: locale(kdebase4:ko;zh_CN;zh_SG) @@ -53,7 +63,12 @@ %package -n %{pkgname} Summary: KDE control module for Fcitx Group: System/I18n/Chinese +%if 0%{?suse_version} %kde4_runtime_requires +%else +Requires: kde-runtime +Requires: qt-x11 +%endif %description -n %{pkgname} KDE control module for Fcitx. @@ -80,7 +95,9 @@ %find_lang kcm_fcitx +%if 0%{?suse_version} %kde_post_install +%endif %post -n %{pkgname} -p /sbin/ldconfig @@ -90,5 +107,8 @@ %defattr(-,root,root,-) %{_libdir}/kde4/* %{_datadir}/kde4/* +%if 0%{?fedora_version} +%{_datadir}/config/fcitx-skin.knsrc +%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:12.2
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package grub2 for openSUSE:12.2 checked in at 2012-06-29 06:59:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/grub2 (Old) and /work/SRC/openSUSE:12.2/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/grub2/grub2.changes 2012-06-25 15:34:46.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.grub2.new/grub2.changes 2012-06-29 06:59:52.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Jun 28 09:33:26 CEST 2012 - jslaby(a)suse.de + +- update to 2.0 final + * see ChangeLog for changes + +------------------------------------------------------------------- +Mon Jun 25 11:10:27 UTC 2012 - adrian(a)suse.de + +- enable xz/lzma support for image file generation + +------------------------------------------------------------------- +Sun Jun 24 18:10:27 UTC 2012 - jslaby(a)suse.de + +- update to 2.0 beta6, a snapshot from today + * see ChangeLog for changes + +------------------------------------------------------------------- Old: ---- gcc46-fixes.patch gccwarn.patch grub-1.99.tar.xz grub2-automake-1-11-2.patch grub2-gcc47.patch grub2-probe-disk-mountby.patch grub2-unused.patch os-prober_osx.patch translations-20111024.tar.bz2 New: ---- grub-2.00.tar.xz grub2-correct-font-path.patch rename-grub-info-file-to-grub2.patch translations-20120622.tar.xz use-grub2-as-a-package-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.XpY5xX/_old 2012-06-29 06:59:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XpY5xX/_new 2012-06-29 06:59:53.000000000 +0200 @@ -33,17 +33,18 @@ BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel %endif +BuildRequires: autogen BuildRequires: automake BuildRequires: bison BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: flex +BuildRequires: fuse-devel BuildRequires: gnu-unifont BuildRequires: lzma -BuildRequires: ruby -BuildRequires: xz -BuildRequires: autogen BuildRequires: python +BuildRequires: ruby +BuildRequires: xz-devel %if 0%{?suse_version} == 1210 BuildRequires: guile %endif @@ -61,30 +62,27 @@ %global efi %{ix86} x86_64 ia64 %endif -Version: 1.99 +Version: 2.00 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0+ Group: System/Boot Url: http://www.gnu.org/software/grub/ -Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz +%define rev 20120622 +Source0: grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default Source3: README.openSUSE Source4: grub2.rpmlintrc # rsync -Lrtvz translationproject.org::tp/latest/grub/ po -Source5: translations-20111024.tar.bz2 -Patch0: gcc46-fixes.patch +Source5: translations-20120622.tar.xz +Patch0: grub2-correct-font-path.patch +Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch -Patch3: gccwarn.patch +Patch3: use-grub2-as-a-package-name.patch Patch4: grub2-linux-submenu.patch -Patch5: grub2-unused.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch -Patch8: grub2-gcc47.patch -Patch9: os-prober_osx.patch -Patch10: grub2-probe-disk-mountby.patch -Patch11: grub2-automake-1-11-2.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober @@ -127,34 +125,24 @@ %endif %prep -# We create (if we build for efi) two copies of the sources -# in the Builddir -%setup -T -c -n grub-%{version} -%setup -D -T -q -n grub-%{version} -a 0 -(cd grub-%{version};tar xaf %{SOURCE5}) -(cd grub-%{version}/po && ls *.po | cut -d. -f1 | xargs) >grub-%{version}/po/LINGUAS -sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi >grub-%{version}/docs/grub2.texi -sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am -## fix unifont location so grub-mkfont can create *.pf2 files -sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure.ac +# We create (if we build for efi) two copies of the sources in the Builddir +%setup -q -T -c -n grub-%{version} -a 0 -a 5 +cp -r po grub-%{version}/ cd grub-%{version} +(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 +#%%patch4 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 cd .. # README.openSUSE cp %{SOURCE3} grub-%{version}/ %ifarch %{efi} -cp -a grub-%{version} grub-efi-%{version} +(cp -a grub-%{version} grub-efi-%{version}) %endif %build @@ -171,7 +159,7 @@ --target=%{_target_platform} \ --with-platform=efi \ --program-transform-name=s,grub,%{name}-efi, -make %{?_smp_mflags} +make %{?_smp_mflags} pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi %ifarch %{ix86} %define grubefiarch i386-efi %else @@ -182,6 +170,7 @@ loadbios reboot halt search font gfxterm cd .. %endif + cd grub-%{version} ./autogen.sh @@ -210,7 +199,7 @@ %install %ifarch %{efi} cd grub-efi-%{version} -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi install # Ghost config file install -d $RPM_BUILD_ROOT/boot/%{name}-efi @@ -223,7 +212,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h cd .. - %endif cd grub-%{version} @@ -242,7 +230,7 @@ # Defaults install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub -%find_lang grub +%find_lang %{name} %fdupes %buildroot%{_bindir} %post @@ -250,23 +238,16 @@ /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : mkdir -p /boot/%{name}/ 2>/dev/null || true -# Create device.map or reuse one from GRUB Legacy -if [ ! -e /boot/%{name}/device.map ] ; then - cp -u /boot/grub/device.map /boot/%{name}/device.map 2>/dev/null || - %{name}-mkdevicemap -fi -if [ -e /boot/%{name}/device.map ]; then - # Determine the partition with /boot - BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}')) - # Generate core.img, but don't let it be installed in boot sector - %{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true - exec >/dev/null 2>&1 - # Remove stale menu.lst entries - /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true - # Add core.img as multiboot kernel to GRUB Legacy menu - /sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true - /sbin/update-bootloader --refresh || true -fi +# Determine the partition with /boot +BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}')) +# Generate core.img, but don't let it be installed in boot sector +%{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true +exec >/dev/null 2>&1 +# Remove stale menu.lst entries +/sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true +# Add core.img as multiboot kernel to GRUB Legacy menu +/sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true +/sbin/update-bootloader --refresh || true %ifarch %{efi} @@ -300,29 +281,57 @@ fi %endif -%files -f grub-%{version}/grub.lang +%files -f grub-%{version}/%{name}.lang %defattr(-,root,root,-) -%{_libdir}/%{name} -%{_sbindir}/%{name}-* -%{_datadir}/%{name} -%{_datadir}/grub -%ifarch %{efi} -%exclude %{_sbindir}/grub2-efi-* -%endif -%{_bindir}/%{name}-* -%ifarch %{efi} -%exclude %{_bindir}/%{name}-efi-* -%endif +%doc grub-%{version}/COPYING grub-%{version}/NEWS grub-%{version}/README +%doc grub-%{version}/THANKS grub-%{version}/TODO grub-%{version}/ChangeLog +%doc grub-%{version}/README.openSUSE +%dir /boot/%{name} +%ghost /boot/%{name}/grub.cfg %{_sysconfdir}/bash_completion.d/grub %config(noreplace) %{_sysconfdir}/default/grub %dir %{_sysconfdir}/grub.d %{_sysconfdir}/grub.d/README %config %{_sysconfdir}/grub.d/??_* -%dir /boot/%{name} -%ghost /boot/%{name}/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%{_sbindir}/%{name}-bios-setup +%{_sbindir}/%{name}-install +%{_sbindir}/%{name}-mkconfig +%{_sbindir}/%{name}-mknetdir +%{_sbindir}/%{name}-ofpathname +%{_sbindir}/%{name}-probe +%{_sbindir}/%{name}-reboot +%{_sbindir}/%{name}-set-default +%{_sbindir}/%{name}-sparc64-setup +%{_bindir}/%{name}-editenv +%{_bindir}/%{name}-fstest +%{_bindir}/%{name}-kbdcomp +%{_bindir}/%{name}-menulst2cfg +%{_bindir}/%{name}-mkfont +%{_bindir}/%{name}-mkimage +%{_bindir}/%{name}-mklayout +%{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mkrelpath +%{_bindir}/%{name}-mkrescue +%{_bindir}/%{name}-mkstandalone +%{_bindir}/%{name}-mount +%{_bindir}/%{name}-script-check +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/*/ +%{_libdir}/%{name}/*/*.image +%{_libdir}/%{name}/*/*.img +%{_libdir}/%{name}/*/*.lst +%{_libdir}/%{name}/*/*.mod +%{_libdir}/%{name}/*/*.module +%ifarch x86_64 +%{_libdir}/%{name}/*/efiemu*.o +%endif +%{_libdir}/%{name}/*/gdb_grub2 +%{_libdir}/%{name}/*/gmodule.pl +%{_libdir}/%{name}/*/kernel.exec +%{_libdir}/%{name}/*/modinfo.sh +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.pf2 +%{_datadir}/%{name}/grub-mkconfig_lib %{_infodir}/grub-dev.info* %{_infodir}/%{name}.info* @@ -332,41 +341,46 @@ %defattr(-,root,root,-) %dir /boot/efi %dir /boot/efi/EFI -%attr(0755,root,root)/boot/efi/EFI/opensuse -%{_libdir}/grub2-efi +%dir /boot/efi/EFI/opensuse +%attr(0755,root,root)/boot/efi/EFI/opensuse/grub.efi +%dir /boot/grub2-efi +%ghost /boot/grub2-efi/grub.cfg +%{_sbindir}/grub2-efi-bios-setup +%{_sbindir}/grub2-efi-install %{_sbindir}/grub2-efi-mkconfig -%{_sbindir}/grub2-efi-mkdevicemap %{_sbindir}/grub2-efi-mknetdir -%{_sbindir}/grub2-efi-install +%{_sbindir}/grub2-efi-ofpathname %{_sbindir}/grub2-efi-probe %{_sbindir}/grub2-efi-reboot %{_sbindir}/grub2-efi-set-default -#%%{_sbindir}/grub2-efi-setup -%{_bindir}/grub2-efi-bin2h +%{_sbindir}/grub2-efi-sparc64-setup %{_bindir}/grub2-efi-editenv %{_bindir}/grub2-efi-fstest %{_bindir}/grub2-efi-kbdcomp %{_bindir}/grub2-efi-menulst2cfg -# %%{_bindir}/grub2-efi-mkelfimage +%{_bindir}/grub2-efi-mkstandalone %{_bindir}/grub2-efi-mkfont %{_bindir}/grub2-efi-mklayout %{_bindir}/grub2-efi-mkimage -# %%{_bindir}/grub2-efi-mkisofs %{_bindir}/grub2-efi-mkpasswd-pbkdf2 %{_bindir}/grub2-efi-mkrelpath %ifnarch %{sparc} ppc ppc64 %{_bindir}/grub2-efi-mkrescue %endif -%ifarch %{sparc} ppc ppc64 -%{_sbindir}/grub2-efi-ofpathname -%endif +%{_bindir}/grub2-efi-mount %{_bindir}/grub2-efi-script-check -%dir /boot/grub2-efi -%ghost /boot/grub2-efi/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%dir %{_libdir}/%{name}-efi/ +%dir %{_libdir}/%{name}-efi/*/ +%{_libdir}/%{name}-efi/*/*.img +%{_libdir}/%{name}-efi/*/*.lst +%{_libdir}/%{name}-efi/*/*.mod +%{_libdir}/%{name}-efi/*/*.module +%{_libdir}/%{name}-efi/*/gdb_grub2-efi +%{_libdir}/%{name}-efi/*/gmodule.pl +%{_libdir}/%{name}-efi/*/kernel.exec +%{_libdir}/%{name}-efi/*/modinfo.sh %dir %{_datadir}/%{name}-efi +%{_datadir}/%{name}-efi/grub-mkconfig_lib %{_datadir}/%{name}-efi/*.pf2 %endif ++++++ grub2-correct-font-path.patch ++++++ Suse has its fonts in /usr/share/fonts/uni, so use it. --- --- a/configure.ac 2012-06-06 10:36:33 +0000 +++ b/configure.ac 2012-06-24 13:24:26 +0000 @@ -242,7 +242,7 @@ FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 --- a/configure +++ b/configure @@ -4126,7 +4126,7 @@ fi FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 ++++++ grub2-install-opt-skip-fs-probe.patch ++++++ --- /var/tmp/diff_new_pack.XpY5xX/_old 2012-06-29 06:59:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XpY5xX/_new 2012-06-29 06:59:53.000000000 +0200 @@ -1,3 +1,7 @@ +References: bnc#750897 + +--- + Index: grub-1.99/util/grub-install.in =================================================================== --- grub-1.99.orig/util/grub-install.in @@ -10,14 +14,14 @@ + setup_skip_fs_probe="--skip-fs-probe" ;; + -*) - echo "Unrecognized option \`$option'" 1>&2 + gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2 usage @@ -581,7 +584,7 @@ fi - # Perform the platform-dependent install - if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then + # Perform the grub_modinfo_platform-dependent install + if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then # Now perform the installation. -- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}" \ -+ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}" \ +- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ ++ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ --device-map="${device_map}" "${install_device}" || exit 1 - elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then - if [ x"$update_nvram" = xyes ]; then + elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ]; then + ++++++ grub2-iterate-and-hook-for-extended-partition.patch ++++++ --- /var/tmp/diff_new_pack.XpY5xX/_old 2012-06-29 06:59:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XpY5xX/_new 2012-06-29 06:59:53.000000000 +0200 @@ -1,9 +1,12 @@ +References: bnc#750897 + +--- Index: grub-1.99/grub-core/partmap/msdos.c =================================================================== --- grub-1.99.orig/grub-core/partmap/msdos.c +++ grub-1.99/grub-core/partmap/msdos.c @@ -107,11 +107,15 @@ grub_partition_msdos_iterate (grub_disk_ - return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr"); + (unsigned long long) p.len); /* If this partition is a normal one, call the hook. */ - if (! grub_msdos_partition_is_empty (e->type) ++++++ grub2-linux.patch ++++++ --- /var/tmp/diff_new_pack.XpY5xX/_old 2012-06-29 06:59:53.000000000 +0200 +++ /var/tmp/diff_new_pack.XpY5xX/_new 2012-06-29 06:59:53.000000000 +0200 @@ -13,10 +13,10 @@ @@ -116,7 +116,7 @@ EOF message="$(gettext_printf "Loading Linux %s ..." ${version})" - cat << EOF + sed "s/^/$submenu_indentation/" << EOF echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args} EOF if test -n "${initrd}" ; then - message="$(gettext_printf "Loading initial ramdisk ...")" + # TRANSLATORS: ramdisk isn't identifier. Should be translated. ++++++ rename-grub-info-file-to-grub2.patch ++++++ >From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jirislaby(a)gmail.com> Date: Sun, 24 Jun 2012 15:40:40 +0200 Subject: [PATCH] rename grub info file to grub2 Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> --- docs/Makefile.am | 2 +- docs/Makefile.in | 46 ++++++++++++++++++++-------------------- docs/{grub.texi => grub2.texi} | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) rename docs/{grub.texi => grub2.texi} (99%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 93eb396..4143042 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt diff --git a/docs/Makefile.in b/docs/Makefile.in index 217ea7e..49dc477 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -35,8 +35,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = docs -DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ $(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \ texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = -INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info +INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux -DVIS = grub.dvi grub-dev.dvi -PDFS = grub.pdf grub-dev.pdf -PSS = grub.ps grub-dev.ps -HTMLS = grub.html grub-dev.html -TEXINFOS = grub.texi grub-dev.texi +DVIS = grub2.dvi grub-dev.dvi +PDFS = grub2.pdf grub-dev.pdf +PSS = grub2.ps grub-dev.ps +HTMLS = grub2.html grub-dev.html +TEXINFOS = grub2.texi grub-dev.texi TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html @@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt all: all-am @@ -850,14 +850,14 @@ $(am__aclocal_m4_deps): rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) +$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi +grub2.dvi: grub2.texi $(srcdir)/version.texi +grub2.pdf: grub2.texi $(srcdir)/version.texi +grub2.html: grub2.texi $(srcdir)/version.texi $(srcdir)/version.texi: $(srcdir)/stamp-vti -$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure - @(dir=.; test -f ./grub.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \ +$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure + @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \ + set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ @@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -rf grub.aux grub.cp grub.cps grub.fn grub.ky grub.log grub.pg grub.tmp \ - grub.toc grub.tp grub.vr grub-dev.aux grub-dev.cp \ - grub-dev.cps grub-dev.fn grub-dev.ky grub-dev.log \ - grub-dev.pg grub-dev.tmp grub-dev.toc grub-dev.tp \ - grub-dev.vr + -rm -rf grub2.aux grub2.cp grub2.cps grub2.fn grub2.ky grub2.log grub2.pg \ + grub2.tmp grub2.toc grub2.tp grub2.vr grub-dev.aux \ + grub-dev.cp grub-dev.cps grub-dev.fn grub-dev.ky \ + grub-dev.log grub-dev.pg grub-dev.tmp grub-dev.toc \ + grub-dev.tp grub-dev.vr clean-aminfo: - -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html" \ - || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html maintainer-clean-aminfo: diff --git a/docs/grub.texi b/docs/grub2.texi similarity index 99% rename from docs/grub.texi rename to docs/grub2.texi index 26944ac..fb7fb0e 100644 --- a/docs/grub.texi +++ b/docs/grub2.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename grub.info +@setfilename grub2.info @include version.texi @settitle GNU GRUB Manual @value{VERSION} @c Unify all our little indices for now. -- 1.7.10.4 ++++++ use-grub2-as-a-package-name.patch ++++++ >From 3729b131ef1dcaa043242e8074418249695d381b Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jirislaby(a)gmail.com> Date: Sun, 24 Jun 2012 20:51:52 +0200 Subject: [PATCH] use grub2 as a package name This will ease all of the renaming of directories and all the pkgdata hacks. Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> --- configure | 24 ++++++++++++------------ configure.ac | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 50e6bf6..544c16a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GRUB 2.00. +# Generated by GNU Autoconf 2.68 for GRUB2 2.00. # # Report bugs to <bug-grub(a)gnu.org>. # @@ -558,10 +558,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='GRUB' -PACKAGE_TARNAME='grub' +PACKAGE_NAME='GRUB2' +PACKAGE_TARNAME='grub2' PACKAGE_VERSION='2.00' -PACKAGE_STRING='GRUB 2.00' +PACKAGE_STRING='GRUB2 2.00' PACKAGE_BUGREPORT='bug-grub(a)gnu.org' PACKAGE_URL='' @@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then # 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 GRUB 2.00 to adapt to many kinds of systems. +\`configure' configures GRUB2 2.00 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1952,7 +1952,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/grub] + --docdir=DIR documentation root [DATAROOTDIR/doc/grub2] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1975,7 +1975,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GRUB 2.00:";; + short | recursive ) echo "Configuration of GRUB2 2.00:";; esac cat <<\_ACEOF @@ -2108,7 +2108,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GRUB configure 2.00 +GRUB2 configure 2.00 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GRUB $as_me 2.00, which was +It was created by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3789,7 +3789,7 @@ fi # Define the identity of the package. - PACKAGE='grub' + PACKAGE='grub2' VERSION='2.00' @@ -23344,7 +23344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GRUB $as_me 2.00, which was +This file was extended by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23414,7 +23414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GRUB config.status 2.00 +GRUB2 config.status 2.00 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1b5132c..5ea7ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_" dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target dnl type. -AC_INIT([GRUB],[2.00],[bug-grub(a)gnu.org]) +AC_INIT([GRUB2],[2.00],[bug-grub(a)gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '12

29 Jun '12

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2012-06-29 06:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2012-06-25 15:24:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-06-29 06:59:47.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Jun 28 09:33:26 CEST 2012 - jslaby(a)suse.de + +- update to 2.0 final + * see ChangeLog for changes + +------------------------------------------------------------------- +Mon Jun 25 11:10:27 UTC 2012 - adrian(a)suse.de + +- enable xz/lzma support for image file generation + +------------------------------------------------------------------- +Sun Jun 24 18:10:27 UTC 2012 - jslaby(a)suse.de + +- update to 2.0 beta6, a snapshot from today + * see ChangeLog for changes + +------------------------------------------------------------------- Old: ---- gcc46-fixes.patch gccwarn.patch grub-1.99.tar.xz grub2-automake-1-11-2.patch grub2-gcc47.patch grub2-probe-disk-mountby.patch grub2-unused.patch os-prober_osx.patch translations-20111024.tar.bz2 New: ---- grub-2.00.tar.xz grub2-correct-font-path.patch rename-grub-info-file-to-grub2.patch translations-20120622.tar.xz use-grub2-as-a-package-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -33,17 +33,18 @@ BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel %endif +BuildRequires: autogen BuildRequires: automake BuildRequires: bison BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: flex +BuildRequires: fuse-devel BuildRequires: gnu-unifont BuildRequires: lzma -BuildRequires: ruby -BuildRequires: xz -BuildRequires: autogen BuildRequires: python +BuildRequires: ruby +BuildRequires: xz-devel %if 0%{?suse_version} == 1210 BuildRequires: guile %endif @@ -61,30 +62,27 @@ %global efi %{ix86} x86_64 ia64 %endif -Version: 1.99 +Version: 2.00 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0+ Group: System/Boot Url: http://www.gnu.org/software/grub/ -Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz +%define rev 20120622 +Source0: grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default Source3: README.openSUSE Source4: grub2.rpmlintrc # rsync -Lrtvz translationproject.org::tp/latest/grub/ po -Source5: translations-20111024.tar.bz2 -Patch0: gcc46-fixes.patch +Source5: translations-20120622.tar.xz +Patch0: grub2-correct-font-path.patch +Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch -Patch3: gccwarn.patch +Patch3: use-grub2-as-a-package-name.patch Patch4: grub2-linux-submenu.patch -Patch5: grub2-unused.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch -Patch8: grub2-gcc47.patch -Patch9: os-prober_osx.patch -Patch10: grub2-probe-disk-mountby.patch -Patch11: grub2-automake-1-11-2.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober @@ -127,34 +125,24 @@ %endif %prep -# We create (if we build for efi) two copies of the sources -# in the Builddir -%setup -T -c -n grub-%{version} -%setup -D -T -q -n grub-%{version} -a 0 -(cd grub-%{version};tar xaf %{SOURCE5}) -(cd grub-%{version}/po && ls *.po | cut -d. -f1 | xargs) >grub-%{version}/po/LINGUAS -sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi >grub-%{version}/docs/grub2.texi -sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am -## fix unifont location so grub-mkfont can create *.pf2 files -sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure.ac +# We create (if we build for efi) two copies of the sources in the Builddir +%setup -q -T -c -n grub-%{version} -a 0 -a 5 +cp -r po grub-%{version}/ cd grub-%{version} +(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 +#%%patch4 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 cd .. # README.openSUSE cp %{SOURCE3} grub-%{version}/ %ifarch %{efi} -cp -a grub-%{version} grub-efi-%{version} +(cp -a grub-%{version} grub-efi-%{version}) %endif %build @@ -171,7 +159,7 @@ --target=%{_target_platform} \ --with-platform=efi \ --program-transform-name=s,grub,%{name}-efi, -make %{?_smp_mflags} +make %{?_smp_mflags} pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi %ifarch %{ix86} %define grubefiarch i386-efi %else @@ -182,6 +170,7 @@ loadbios reboot halt search font gfxterm cd .. %endif + cd grub-%{version} ./autogen.sh @@ -210,7 +199,7 @@ %install %ifarch %{efi} cd grub-efi-%{version} -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi install # Ghost config file install -d $RPM_BUILD_ROOT/boot/%{name}-efi @@ -223,7 +212,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h cd .. - %endif cd grub-%{version} @@ -242,7 +230,7 @@ # Defaults install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub -%find_lang grub +%find_lang %{name} %fdupes %buildroot%{_bindir} %post @@ -250,23 +238,16 @@ /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : mkdir -p /boot/%{name}/ 2>/dev/null || true -# Create device.map or reuse one from GRUB Legacy -if [ ! -e /boot/%{name}/device.map ] ; then - cp -u /boot/grub/device.map /boot/%{name}/device.map 2>/dev/null || - %{name}-mkdevicemap -fi -if [ -e /boot/%{name}/device.map ]; then - # Determine the partition with /boot - BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}')) - # Generate core.img, but don't let it be installed in boot sector - %{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true - exec >/dev/null 2>&1 - # Remove stale menu.lst entries - /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true - # Add core.img as multiboot kernel to GRUB Legacy menu - /sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true - /sbin/update-bootloader --refresh || true -fi +# Determine the partition with /boot +BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}')) +# Generate core.img, but don't let it be installed in boot sector +%{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true +exec >/dev/null 2>&1 +# Remove stale menu.lst entries +/sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true +# Add core.img as multiboot kernel to GRUB Legacy menu +/sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true +/sbin/update-bootloader --refresh || true %ifarch %{efi} @@ -300,29 +281,57 @@ fi %endif -%files -f grub-%{version}/grub.lang +%files -f grub-%{version}/%{name}.lang %defattr(-,root,root,-) -%{_libdir}/%{name} -%{_sbindir}/%{name}-* -%{_datadir}/%{name} -%{_datadir}/grub -%ifarch %{efi} -%exclude %{_sbindir}/grub2-efi-* -%endif -%{_bindir}/%{name}-* -%ifarch %{efi} -%exclude %{_bindir}/%{name}-efi-* -%endif +%doc grub-%{version}/COPYING grub-%{version}/NEWS grub-%{version}/README +%doc grub-%{version}/THANKS grub-%{version}/TODO grub-%{version}/ChangeLog +%doc grub-%{version}/README.openSUSE +%dir /boot/%{name} +%ghost /boot/%{name}/grub.cfg %{_sysconfdir}/bash_completion.d/grub %config(noreplace) %{_sysconfdir}/default/grub %dir %{_sysconfdir}/grub.d %{_sysconfdir}/grub.d/README %config %{_sysconfdir}/grub.d/??_* -%dir /boot/%{name} -%ghost /boot/%{name}/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%{_sbindir}/%{name}-bios-setup +%{_sbindir}/%{name}-install +%{_sbindir}/%{name}-mkconfig +%{_sbindir}/%{name}-mknetdir +%{_sbindir}/%{name}-ofpathname +%{_sbindir}/%{name}-probe +%{_sbindir}/%{name}-reboot +%{_sbindir}/%{name}-set-default +%{_sbindir}/%{name}-sparc64-setup +%{_bindir}/%{name}-editenv +%{_bindir}/%{name}-fstest +%{_bindir}/%{name}-kbdcomp +%{_bindir}/%{name}-menulst2cfg +%{_bindir}/%{name}-mkfont +%{_bindir}/%{name}-mkimage +%{_bindir}/%{name}-mklayout +%{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mkrelpath +%{_bindir}/%{name}-mkrescue +%{_bindir}/%{name}-mkstandalone +%{_bindir}/%{name}-mount +%{_bindir}/%{name}-script-check +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/*/ +%{_libdir}/%{name}/*/*.image +%{_libdir}/%{name}/*/*.img +%{_libdir}/%{name}/*/*.lst +%{_libdir}/%{name}/*/*.mod +%{_libdir}/%{name}/*/*.module +%ifarch x86_64 +%{_libdir}/%{name}/*/efiemu*.o +%endif +%{_libdir}/%{name}/*/gdb_grub2 +%{_libdir}/%{name}/*/gmodule.pl +%{_libdir}/%{name}/*/kernel.exec +%{_libdir}/%{name}/*/modinfo.sh +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.pf2 +%{_datadir}/%{name}/grub-mkconfig_lib %{_infodir}/grub-dev.info* %{_infodir}/%{name}.info* @@ -332,41 +341,46 @@ %defattr(-,root,root,-) %dir /boot/efi %dir /boot/efi/EFI -%attr(0755,root,root)/boot/efi/EFI/opensuse -%{_libdir}/grub2-efi +%dir /boot/efi/EFI/opensuse +%attr(0755,root,root)/boot/efi/EFI/opensuse/grub.efi +%dir /boot/grub2-efi +%ghost /boot/grub2-efi/grub.cfg +%{_sbindir}/grub2-efi-bios-setup +%{_sbindir}/grub2-efi-install %{_sbindir}/grub2-efi-mkconfig -%{_sbindir}/grub2-efi-mkdevicemap %{_sbindir}/grub2-efi-mknetdir -%{_sbindir}/grub2-efi-install +%{_sbindir}/grub2-efi-ofpathname %{_sbindir}/grub2-efi-probe %{_sbindir}/grub2-efi-reboot %{_sbindir}/grub2-efi-set-default -#%%{_sbindir}/grub2-efi-setup -%{_bindir}/grub2-efi-bin2h +%{_sbindir}/grub2-efi-sparc64-setup %{_bindir}/grub2-efi-editenv %{_bindir}/grub2-efi-fstest %{_bindir}/grub2-efi-kbdcomp %{_bindir}/grub2-efi-menulst2cfg -# %%{_bindir}/grub2-efi-mkelfimage +%{_bindir}/grub2-efi-mkstandalone %{_bindir}/grub2-efi-mkfont %{_bindir}/grub2-efi-mklayout %{_bindir}/grub2-efi-mkimage -# %%{_bindir}/grub2-efi-mkisofs %{_bindir}/grub2-efi-mkpasswd-pbkdf2 %{_bindir}/grub2-efi-mkrelpath %ifnarch %{sparc} ppc ppc64 %{_bindir}/grub2-efi-mkrescue %endif -%ifarch %{sparc} ppc ppc64 -%{_sbindir}/grub2-efi-ofpathname -%endif +%{_bindir}/grub2-efi-mount %{_bindir}/grub2-efi-script-check -%dir /boot/grub2-efi -%ghost /boot/grub2-efi/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%dir %{_libdir}/%{name}-efi/ +%dir %{_libdir}/%{name}-efi/*/ +%{_libdir}/%{name}-efi/*/*.img +%{_libdir}/%{name}-efi/*/*.lst +%{_libdir}/%{name}-efi/*/*.mod +%{_libdir}/%{name}-efi/*/*.module +%{_libdir}/%{name}-efi/*/gdb_grub2-efi +%{_libdir}/%{name}-efi/*/gmodule.pl +%{_libdir}/%{name}-efi/*/kernel.exec +%{_libdir}/%{name}-efi/*/modinfo.sh %dir %{_datadir}/%{name}-efi +%{_datadir}/%{name}-efi/grub-mkconfig_lib %{_datadir}/%{name}-efi/*.pf2 %endif ++++++ grub2-correct-font-path.patch ++++++ Suse has its fonts in /usr/share/fonts/uni, so use it. --- --- a/configure.ac 2012-06-06 10:36:33 +0000 +++ b/configure.ac 2012-06-24 13:24:26 +0000 @@ -242,7 +242,7 @@ FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 --- a/configure +++ b/configure @@ -4126,7 +4126,7 @@ fi FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 ++++++ grub2-install-opt-skip-fs-probe.patch ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -1,3 +1,7 @@ +References: bnc#750897 + +--- + Index: grub-1.99/util/grub-install.in =================================================================== --- grub-1.99.orig/util/grub-install.in @@ -10,14 +14,14 @@ + setup_skip_fs_probe="--skip-fs-probe" ;; + -*) - echo "Unrecognized option \`$option'" 1>&2 + gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2 usage @@ -581,7 +584,7 @@ fi - # Perform the platform-dependent install - if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then + # Perform the grub_modinfo_platform-dependent install + if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then # Now perform the installation. -- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}" \ -+ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}" \ +- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ ++ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ --device-map="${device_map}" "${install_device}" || exit 1 - elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then - if [ x"$update_nvram" = xyes ]; then + elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ]; then + ++++++ grub2-iterate-and-hook-for-extended-partition.patch ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -1,9 +1,12 @@ +References: bnc#750897 + +--- Index: grub-1.99/grub-core/partmap/msdos.c =================================================================== --- grub-1.99.orig/grub-core/partmap/msdos.c +++ grub-1.99/grub-core/partmap/msdos.c @@ -107,11 +107,15 @@ grub_partition_msdos_iterate (grub_disk_ - return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr"); + (unsigned long long) p.len); /* If this partition is a normal one, call the hook. */ - if (! grub_msdos_partition_is_empty (e->type) ++++++ grub2-linux.patch ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -13,10 +13,10 @@ @@ -116,7 +116,7 @@ EOF message="$(gettext_printf "Loading Linux %s ..." ${version})" - cat << EOF + sed "s/^/$submenu_indentation/" << EOF echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args} EOF if test -n "${initrd}" ; then - message="$(gettext_printf "Loading initial ramdisk ...")" + # TRANSLATORS: ramdisk isn't identifier. Should be translated. ++++++ rename-grub-info-file-to-grub2.patch ++++++ >From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jirislaby(a)gmail.com> Date: Sun, 24 Jun 2012 15:40:40 +0200 Subject: [PATCH] rename grub info file to grub2 Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> --- docs/Makefile.am | 2 +- docs/Makefile.in | 46 ++++++++++++++++++++-------------------- docs/{grub.texi => grub2.texi} | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) rename docs/{grub.texi => grub2.texi} (99%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 93eb396..4143042 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt diff --git a/docs/Makefile.in b/docs/Makefile.in index 217ea7e..49dc477 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -35,8 +35,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = docs -DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ $(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \ texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = -INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info +INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux -DVIS = grub.dvi grub-dev.dvi -PDFS = grub.pdf grub-dev.pdf -PSS = grub.ps grub-dev.ps -HTMLS = grub.html grub-dev.html -TEXINFOS = grub.texi grub-dev.texi +DVIS = grub2.dvi grub-dev.dvi +PDFS = grub2.pdf grub-dev.pdf +PSS = grub2.ps grub-dev.ps +HTMLS = grub2.html grub-dev.html +TEXINFOS = grub2.texi grub-dev.texi TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html @@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt all: all-am @@ -850,14 +850,14 @@ $(am__aclocal_m4_deps): rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) +$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi +grub2.dvi: grub2.texi $(srcdir)/version.texi +grub2.pdf: grub2.texi $(srcdir)/version.texi +grub2.html: grub2.texi $(srcdir)/version.texi $(srcdir)/version.texi: $(srcdir)/stamp-vti -$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure - @(dir=.; test -f ./grub.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \ +$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure + @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \ + set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ @@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -rf grub.aux grub.cp grub.cps grub.fn grub.ky grub.log grub.pg grub.tmp \ - grub.toc grub.tp grub.vr grub-dev.aux grub-dev.cp \ - grub-dev.cps grub-dev.fn grub-dev.ky grub-dev.log \ - grub-dev.pg grub-dev.tmp grub-dev.toc grub-dev.tp \ - grub-dev.vr + -rm -rf grub2.aux grub2.cp grub2.cps grub2.fn grub2.ky grub2.log grub2.pg \ + grub2.tmp grub2.toc grub2.tp grub2.vr grub-dev.aux \ + grub-dev.cp grub-dev.cps grub-dev.fn grub-dev.ky \ + grub-dev.log grub-dev.pg grub-dev.tmp grub-dev.toc \ + grub-dev.tp grub-dev.vr clean-aminfo: - -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html" \ - || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html maintainer-clean-aminfo: diff --git a/docs/grub.texi b/docs/grub2.texi similarity index 99% rename from docs/grub.texi rename to docs/grub2.texi index 26944ac..fb7fb0e 100644 --- a/docs/grub.texi +++ b/docs/grub2.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename grub.info +@setfilename grub2.info @include version.texi @settitle GNU GRUB Manual @value{VERSION} @c Unify all our little indices for now. -- 1.7.10.4 ++++++ use-grub2-as-a-package-name.patch ++++++ >From 3729b131ef1dcaa043242e8074418249695d381b Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jirislaby(a)gmail.com> Date: Sun, 24 Jun 2012 20:51:52 +0200 Subject: [PATCH] use grub2 as a package name This will ease all of the renaming of directories and all the pkgdata hacks. Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> --- configure | 24 ++++++++++++------------ configure.ac | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 50e6bf6..544c16a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GRUB 2.00. +# Generated by GNU Autoconf 2.68 for GRUB2 2.00. # # Report bugs to <bug-grub(a)gnu.org>. # @@ -558,10 +558,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='GRUB' -PACKAGE_TARNAME='grub' +PACKAGE_NAME='GRUB2' +PACKAGE_TARNAME='grub2' PACKAGE_VERSION='2.00' -PACKAGE_STRING='GRUB 2.00' +PACKAGE_STRING='GRUB2 2.00' PACKAGE_BUGREPORT='bug-grub(a)gnu.org' PACKAGE_URL='' @@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then # 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 GRUB 2.00 to adapt to many kinds of systems. +\`configure' configures GRUB2 2.00 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1952,7 +1952,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/grub] + --docdir=DIR documentation root [DATAROOTDIR/doc/grub2] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1975,7 +1975,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GRUB 2.00:";; + short | recursive ) echo "Configuration of GRUB2 2.00:";; esac cat <<\_ACEOF @@ -2108,7 +2108,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GRUB configure 2.00 +GRUB2 configure 2.00 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GRUB $as_me 2.00, which was +It was created by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3789,7 +3789,7 @@ fi # Define the identity of the package. - PACKAGE='grub' + PACKAGE='grub2' VERSION='2.00' @@ -23344,7 +23344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GRUB $as_me 2.00, which was +This file was extended by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23414,7 +23414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GRUB config.status 2.00 +GRUB2 config.status 2.00 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1b5132c..5ea7ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_" dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target dnl type. -AC_INIT([GRUB],[2.00],[bug-grub(a)gnu.org]) +AC_INIT([GRUB2],[2.00],[bug-grub(a)gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0