Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Thu Oct 13 00:03:02 CEST 2011.
-------- --- openSUSE:Factory/yast2-packager/yast2-packager.changes 2011-10-07 00:54:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-10-12 15:11:13.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 12 15:09:39 CEST 2011 - [email protected] + +- do not add initrd modules when mkintrd itself can add them + (bnc#716785) +- 2.21.19 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.21.18.tar.bz2 New: ---- yast2-packager-2.21.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.bwM3J1/_old 2011-10-13 00:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.bwM3J1/_new 2011-10-13 00:02:57.000000000 +0200 @@ -19,14 +19,12 @@ Name: yast2-packager -Version: 2.21.18 +Version: 2.21.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-packager-%{version}.tar.bz2 -Prefix: /usr - Group: System/YaST License: GPL-2.0+ BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml @@ -103,23 +101,23 @@ %setup -n yast2-packager-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -138,17 +136,17 @@ /usr/share/YaST2/modules/* %exclude /usr/share/YaST2/modules/WebpinPackageSearch.ycp %exclude /usr/share/YaST2/modules/WebpinPackageSearch.ybc -%{prefix}/share/applications/YaST2/*.desktop -%exclude %{prefix}/share/applications/YaST2/webpin.desktop +%{_prefix}/share/applications/YaST2/*.desktop +%exclude %{_prefix}/share/applications/YaST2/webpin.desktop /usr/share/YaST2/scrconf/* -%{prefix}/lib/YaST2/servers_non_y2/ag_* -%doc %{prefix}/share/doc/packages/yast2-packager +%{_prefix}/lib/YaST2/servers_non_y2/ag_* +%doc %{_prefix}/share/doc/packages/yast2-packager %files webpin %defattr(-,root,root) /usr/share/YaST2/clients/webpin_package_search.ycp /usr/share/YaST2/modules/WebpinPackageSearch.ycp /usr/share/YaST2/modules/WebpinPackageSearch.ybc -%{prefix}/share/applications/YaST2/webpin.desktop +%{_prefix}/share/applications/YaST2/webpin.desktop %changelog ++++++ yast2-packager-2.21.18.tar.bz2 -> yast2-packager-2.21.19.tar.bz2 ++++++ ++++ 3023 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.21.18/VERSION new/yast2-packager-2.21.19/VERSION --- old/yast2-packager-2.21.18/VERSION 2011-10-06 13:58:48.000000000 +0200 +++ new/yast2-packager-2.21.19/VERSION 2011-10-12 15:10:04.000000000 +0200 @@ -1 +1 @@ -2.21.18 +2.21.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.21.18/configure.in new/yast2-packager-2.21.19/configure.in --- old/yast2-packager-2.21.18/configure.in 2011-10-06 14:15:13.000000000 +0200 +++ new/yast2-packager-2.21.19/configure.in 2011-10-05 09:59:33.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.21.4 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.21.18, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.21.17, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.18" +VERSION="2.21.17" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.21.18/src/clients/inst_kickoff.ycp new/yast2-packager-2.21.19/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.21.18/src/clients/inst_kickoff.ycp 2011-09-02 11:16:30.000000000 +0200 +++ new/yast2-packager-2.21.19/src/clients/inst_kickoff.ycp 2011-10-12 15:09:30.000000000 +0200 @@ -25,14 +25,6 @@ import "FileUtils"; import "String"; -void AcpiToInitrd () { - if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) - return; - foreach (string m, ["processor", "thermal", "fan"], { - Initrd::AddModule (m, ""); - }); -} - // add xen paravirtualized drivers to initrd if thery are selected for installation void XenPVToInitrd() { @@ -56,35 +48,6 @@ } } -void HyperVPVToInitrd() { - // is any hyper-v-kmp-* package selected? - if (Pkg::IsSelected("hyper-v-kmp-default") - || Pkg::IsSelected("hyper-v-kmp-smp") - || Pkg::IsSelected("hyper-v-kmp-pae") - || Pkg::IsSelected("hyper-v-kmp-bigsmp") - || Pkg::IsSelected("hyper-v-kmp-kdump")) - { - // add modules to initrd - Initrd::AddModule ("hv_blkvsc", ""); - Initrd::AddModule ("hv_netvsc", ""); - Initrd::AddModule ("hv_storvsc", ""); - Initrd::AddModule ("hv_vmbus", ""); - - y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); - - // it also need to be added to MODULES_LOADED_ON_BOOT - Kernel::AddModuleToLoad ("hv_storvsc"); - Kernel::AddModuleToLoad ("hv_netvsc"); - y2milestone ("Added hv_storvsc and hv_netvsc to modules loaded on boot"); - - } - else - { - y2milestone("No hyper-v-kmp-* package is selected for installation, skipping HyperV PV driver installation"); - } -} - - /** * Write a fake mtab to the target system since some %post scripts might * need it. @@ -479,7 +442,6 @@ // fake mtab fake_mtab (); - AcpiToInitrd (); // F#302660: System installation and upgrade workflow: kernel %post // calling ins_bootloader write all config files for bootloader @@ -540,12 +502,10 @@ // Bootloader::PreUpdate (); // -- this function call does NOTHING! } - AcpiToInitrd (); } // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); - HyperVPVToInitrd(); if (Stage::initial ()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.21.18/src/clients/install_test.ycp new/yast2-packager-2.21.19/src/clients/install_test.ycp --- old/yast2-packager-2.21.18/src/clients/install_test.ycp 2010-01-12 11:48:56.000000000 +0100 +++ new/yast2-packager-2.21.19/src/clients/install_test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - import "Package"; - - - Package::InstallAll(["yast2-nfs-server"]); -} continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
