commit yast2-packager for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Mon May 31 22:03:34 CEST 2010. -------- --- yast2-packager/yast2-packager.changes 2010-04-22 14:14:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2010-05-31 21:43:08.000000000 +0200 @@ -1,0 +2,22 @@ +Mon May 31 19:35:45 UTC 2010 - lslezak@suse.cz + +- repositories - refresh also enabled repositories and the end + when "refresh-enabled" command line option is used (bnc#608562) +- 2.19.7 + +------------------------------------------------------------------- +Thu May 6 13:28:47 CEST 2010 - jsrain@suse.cz + +- add hv_netvsc to MODULES_LOADED_ON_BOOT on HyperV (bnc#600792) + +------------------------------------------------------------------- +Fri Apr 30 12:05:38 CEST 2010 - jsrain@suse.cz + +- add hv_storvsc to MODULES_LOADED_ON_BOOT on HyperV (bnc#600792) + +------------------------------------------------------------------- +Wed Apr 28 10:10:44 CEST 2010 - jsrain@suse.cz + +- add HyperV drivers to initrd if KMP is selected (bnc#600212) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.19.6.tar.bz2 New: ---- yast2-packager-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.gxTiI5/_old 2010-05-31 22:02:16.000000000 +0200 +++ /var/tmp/diff_new_pack.gxTiI5/_new 2010-05-31 22:02:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.19.6) +# spec file for package yast2-packager (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.19.6 +Version: 2.19.7 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.19.6.tar.bz2 +Source0: yast2-packager-2.19.7.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.19.6 +%setup -n yast2-packager-2.19.7 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.19.6.tar.bz2 -> yast2-packager-2.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.6/VERSION new/yast2-packager-2.19.7/VERSION --- old/yast2-packager-2.19.6/VERSION 2010-04-22 14:11:15.000000000 +0200 +++ new/yast2-packager-2.19.7/VERSION 2010-05-31 21:37:18.000000000 +0200 @@ -1 +1 @@ -2.19.6 +2.19.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.6/configure new/yast2-packager-2.19.7/configure --- old/yast2-packager-2.19.6/configure 2010-04-22 14:14:00.000000000 +0200 +++ new/yast2-packager-2.19.7/configure 2010-05-31 21:42:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yast2-packager 2.19.6. +# Generated by GNU Autoconf 2.65 for yast2-packager 2.19.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.19.6' -PACKAGE_STRING='yast2-packager 2.19.6' +PACKAGE_VERSION='2.19.7' +PACKAGE_STRING='yast2-packager 2.19.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1220,7 +1220,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.19.6 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.19.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1291,7 +1291,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.19.6:";; + short | recursive ) echo "Configuration of yast2-packager 2.19.7:";; esac cat <<\_ACEOF @@ -1371,7 +1371,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.19.6 +yast2-packager configure 2.19.7 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1388,7 +1388,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.19.6, which was +It was created by yast2-packager $as_me 2.19.7, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2311,7 +2311,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.19.6' + VERSION='2.19.7' cat >>confdefs.h <<_ACEOF @@ -2433,7 +2433,7 @@ -VERSION="2.19.6" +VERSION="2.19.7" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3351,7 +3351,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.19.6, which was +This file was extended by yast2-packager $as_me 2.19.7, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3404,7 +3404,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.19.6 +yast2-packager config.status 2.19.7 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.6/configure.in new/yast2-packager-2.19.7/configure.in --- old/yast2-packager-2.19.6/configure.in 2010-04-22 14:13:55.000000000 +0200 +++ new/yast2-packager-2.19.7/configure.in 2010-05-31 21:42:25.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.19.6, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.19.7, 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.19.6" +VERSION="2.19.7" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.6/src/clients/inst_kickoff.ycp new/yast2-packager-2.19.7/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.19.6/src/clients/inst_kickoff.ycp 2010-01-05 13:45:45.000000000 +0100 +++ new/yast2-packager-2.19.7/src/clients/inst_kickoff.ycp 2010-05-31 21:33:56.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Do various tasks before starting with installation of rpms. * - * $Id: inst_kickoff.ycp 60099 2009-12-14 15:44:01Z aschnell $ + * $Id: inst_kickoff.ycp 61962 2010-05-06 11:45:24Z jsrain $ * */ @@ -39,6 +39,7 @@ // is any xen-kmp-* package selected? if (Pkg::IsSelected("xen-kmp-default") || Pkg::IsSelected("xen-kmp-smp") + || Pkg::IsSelected("xen-kmp-pae") || Pkg::IsSelected("xen-kmp-bigsmp") || Pkg::IsSelected("xen-kmp-kdump")) { @@ -51,7 +52,35 @@ } else { - y2milestone("No xen-kmp-* package is selected for installation, skipping PV driver installation"); + y2milestone("No xen-kmp-* package is selected for installation, skipping XEN PV driver installation"); + } +} + +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"); } } @@ -510,8 +539,9 @@ AcpiToInitrd (); } - // add Xen PV drivers to initrd + // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); + HyperVPVToInitrd(); if (Stage::initial ()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.19.6/src/clients/repositories.ycp new/yast2-packager-2.19.7/src/clients/repositories.ycp --- old/yast2-packager-2.19.6/src/clients/repositories.ycp 2009-11-23 09:06:59.000000000 +0100 +++ new/yast2-packager-2.19.7/src/clients/repositories.ycp 2010-05-31 21:42:14.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: repositories.ycp 59689 2009-11-23 08:06:58Z lslezak $ + * $Id: repositories.ycp 62077 2010-05-31 19:42:12Z lslezak $ * */ @@ -504,11 +504,20 @@ } }); + boolean refresh_enabled = contains(WFM::Args(), "refresh-enabled"); + foreach(map<string,any> src_state, sourceStatesOut, { + integer srcid = src_state["SrcId"]:-1; + + if (refresh_enabled && contains(added, srcid)) + { + y2milestone("Refreshing enabled repository: %1", srcid); + src_state["do_refresh"] = true; + } + if (src_state["do_refresh"]:false) { - integer srcid = src_state["SrcId"]:-1; y2milestone("Downloading metadata for source %1", srcid); success = success && Pkg::SourceRefreshNow(srcid); @@ -1689,6 +1698,12 @@ return ret; } +if (WFM::Args() == [ "refresh-enabled" ]) +{ + y2milestone("Refresh enabled option set"); + return StartInstSource(); +} + return CommandLine::Run(cmdline_description); } // EOF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de