April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68024 - in /trunk/ncurses-pkg/src: Makefile.am NCPackageSelector.cc NCPackageSelector.h NCPkgFilterClassification.cc NCPkgFilterClassification.h NCPkgFilterMain.cc NCPkgFilterMain.h
by gs＠svn2.opensuse.org 25 Apr '12

25 Apr '12

Author: gs Date: Wed Apr 25 14:12:39 2012 New Revision: 68024 URL: http://svn.opensuse.org/viewcvs/yast?rev=68024&view=rev Log: first step to show package classification (e.g. recommended packages), new entry 'Package Classification' added to filter Added: trunk/ncurses-pkg/src/NCPkgFilterClassification.cc trunk/ncurses-pkg/src/NCPkgFilterClassification.h Modified: trunk/ncurses-pkg/src/Makefile.am trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgFilterMain.cc trunk/ncurses-pkg/src/NCPkgFilterMain.h Modified: trunk/ncurses-pkg/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/Makefile.am?rev=… ============================================================================== --- trunk/ncurses-pkg/src/Makefile.am (original) +++ trunk/ncurses-pkg/src/Makefile.am Wed Apr 25 14:12:39 2012 @@ -41,6 +41,7 @@ NCPkgFilterLocale.h \ NCPkgFilterRPMGroups.h \ NCPkgFilterInstSummary.h \ + NCPkgFilterClassification.h \ NCPkgStrings.h \ NCZypp.h @@ -72,6 +73,7 @@ NCPkgFilterLocale.cc \ NCPkgFilterRPMGroups.cc \ NCPkgFilterInstSummary.cc \ + NCPkgFilterClassification.cc \ NCPkgStrings.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Apr 25 14:12:39 2012 @@ -53,6 +53,7 @@ #include "NCPkgFilterPattern.h" #include "NCPkgFilterLocale.h" #include "NCPkgFilterRepo.h" +#include "NCPkgFilterClassification.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" #include "NCPkgMenuDeps.h" @@ -980,6 +981,15 @@ pkgList->fillSummaryList(NCPkgTable::L_Changes); break; } + case PkgClassification: + { + pkgClass = new NCPkgFilterClassification( replPoint, this ); + pkgClass->setSize( oldSize.Sze.W, oldSize.Sze.H ); + pkgClass->Redraw(); + pkgClass->setKeyboardFocus(); + break; + } + default: yuiError() << "zatim nic" << endl; } Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Apr 25 14:12:39 2012 @@ -82,6 +82,7 @@ class NCPkgFilterRPMGroups; class NCPkgFilterSearch; class NCPkgFilterInstSummary; +class NCPkgFilterClassification; class NCPkgPopupFile; class NCPkgMenuExtras; class NCPkgMenuDeps; @@ -141,6 +142,8 @@ NCPkgFilterSearch * searchPopup; // the package search popup NCPkgFilterInstSummary *inst_summary; + NCPkgFilterClassification * pkgClass; // classification of packages + bool youMode; // YOU bool updateMode; // Update bool testMode; // testing @@ -204,7 +207,8 @@ Repositories, RPMGroups, Search, - Summary + Summary, + PkgClassification }; /** Added: trunk/ncurses-pkg/src/NCPkgFilterClassification.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterClass… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterClassification.cc (added) +++ trunk/ncurses-pkg/src/NCPkgFilterClassification.cc Wed Apr 25 14:12:39 2012 @@ -0,0 +1,138 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterRepo.cc + + Author: Gabriele Mohr <gs(a)suse.com> + +/-*/ +#define YUILogComponent "ncurses-pkg" +#include <YUILog.h> + +#include "NCPkgFilterClassification.h" + +#include "YDialog.h" +#include "NCLayoutBox.h" +#include "NCSpacing.h" +#include "NCPackageSelector.h" + +#include "NCZypp.h" + +/* + Textdomain "ncurses-pkg" +*/ + + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgFilterClassification::NCPkgFilterClassification +// METHOD TYPE : Constructor +// +// DESCRIPTION : +// + +NCPkgFilterClassification::NCPkgFilterClassification( YWidget *parent, NCPackageSelector *pkg ) + :NCSelectionBox( parent, "" ) + ,packager(pkg) +{ + // fill seclection box + recommended = new YItem( _("Recommended") ); + addItem( recommended ); + + suggested = new YItem( _("Suggested") ); + addItem( suggested ); + + unneeded = new YItem( _("Unneeded" ) ); + addItem( unneeded ); + + showPackages(); +} + +bool NCPkgFilterClassification::showPackages( ) +{ + int index = getCurrentItem(); + YItem * group = itemAt( index ); + + if ( group == recommended ) + { + yuiMilestone() << "recommended is selected" << endl; + } + else if ( group == suggested ) + { + yuiMilestone() << "suggested is selected" << endl; + } + else if ( group == unneeded ) + { + yuiMilestone() << "unneeded is selected" << endl; + } + + return true; +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgFilterRepo::wHandleInput +// METHOD TYPE : NCursesEvent +// +// DESCRIPTION : default boring handle-input +// + +NCursesEvent NCPkgFilterClassification::wHandleInput( wint_t ch ) +{ + NCursesEvent ret = NCursesEvent::none; + handleInput( ch ); + + switch ( ch ) + { + case KEY_UP: + case KEY_DOWN: + case KEY_NPAGE: + case KEY_PPAGE: + case KEY_END: + case KEY_HOME: { + ret = NCursesEvent::handled; + showPackages(); + break; + } + + default: + ret = NCSelectionBox::wHandleInput( ch ) ; + } + + return ret; +} + Added: trunk/ncurses-pkg/src/NCPkgFilterClassification.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterClass… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterClassification.h (added) +++ trunk/ncurses-pkg/src/NCPkgFilterClassification.h Wed Apr 25 14:12:39 2012 @@ -0,0 +1,105 @@ +/**************************************************************************** +| +| Copyright (c) [2002-2011] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|***************************************************************************/ + + +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgPopupRepo.h + + Author: Bubli <kmachalkova(a)suse.cz> + +/-*/ + +#ifndef NCPkgFilterClassification_h +#define NCPkgFilterClassification_h + +#include <iosfwd> + +#include <vector> +#include <string> +#include <algorithm> + +#include "NCPadWidget.h" +#include "NCPopup.h" +#include "NCPushButton.h" +#include "NCSelectionBox.h" + +#include "NCZypp.h" + +class NCTable; +class NCPushButton; +class NCPackageSelector; + +class NCPkgFilterClassification: public NCSelectionBox +{ +private: + + NCPkgFilterClassification & operator=( const NCPkgFilterClassification & ); + NCPkgFilterClassification ( const NCPkgFilterClassification & ); + + NCPackageSelector *packager; + + YItem *recommended; + YItem *suggested; + YItem *unneeded; + +public: + + /** + * A helper class to hold repository data in a neat table + * widget + * @param parent A parent widget + * @param opt Widget options + */ + + NCPkgFilterClassification ( YWidget *parent, NCPackageSelector *pkg); + + virtual ~NCPkgFilterClassification() {}; + + /** + * Add one line to the selection box + * @param YItem item The package classification, e.g. recommeded, suggested + * @param bool selected Line selected + */ + //virtual void addLine( YItem * item, bool selected ); + + + virtual NCursesEvent wHandleInput ( wint_t ch ); + + /** + * Fill package list + * + */ + bool showPackages( ); + +}; +#endif Modified: trunk/ncurses-pkg/src/NCPkgFilterMain.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterMain.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterMain.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterMain.cc Wed Apr 25 14:12:39 2012 @@ -82,6 +82,9 @@ inst_summary = new YItem( _( "Installation Summary" ) ); items.push_back( inst_summary ); + pkg_class = new YItem( _( "Package Classification" ) ); + items.push_back( pkg_class ); + addItems( items ); } @@ -103,6 +106,8 @@ pkg->replaceFilter ( NCPackageSelector::Search ); else if ( currentItem == inst_summary ) pkg->replaceFilter ( NCPackageSelector::Summary ); + else if ( currentItem == pkg_class ) + pkg->replaceFilter ( NCPackageSelector::PkgClassification ); else yuiError() << "zatim nic" << endl; return true; Modified: trunk/ncurses-pkg/src/NCPkgFilterMain.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterMain.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterMain.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterMain.h Wed Apr 25 14:12:39 2012 @@ -66,7 +66,8 @@ YItem *repositories; YItem *search; YItem *inst_summary; - + YItem *pkg_class; + NCPkgFilterMain (YWidget *parent, string label, NCPackageSelector *pkger ); virtual ~NCPkgFilterMain(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68023 - in /trunk/sound: package/yast2-sound.changes sound/src/Sound.ycp sound/src/sound_write.ycp
by lslezak＠svn2.opensuse.org 25 Apr '12

25 Apr '12

Author: lslezak Date: Wed Apr 25 13:00:06 2012 New Revision: 68023 URL: http://svn.opensuse.org/viewcvs/yast?rev=68023&view=rev Log: - path to asound.state has been changed (now stored in /var/lib/alsa instead of /etc) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/sound_write.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Wed Apr 25 13:00:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 25 10:55:40 UTC 2012 - lslezak(a)suse.cz + +- path to asound.state has been changed (now stored in /var/lib/alsa + instead of /etc) + +------------------------------------------------------------------- Tue Apr 24 14:16:09 UTC 2012 - lslezak(a)suse.cz - reimplemented driver reloading ("rcalsasound reload" does not Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=68… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Wed Apr 25 13:00:06 2012 @@ -204,6 +204,13 @@ include "sound/read_routines.ycp"; include "sound/routines.ycp"; + // returns path to the asound.state file + global define string asound_state() + { + return "/var/lib/alsa/asound.state"; + } + + // ----------- function definitions: /* tiwai: /usr/src/linux/Documentation/sound/alsa/Joystick.txt Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?… ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Wed Apr 25 13:00:06 2012 @@ -85,7 +85,7 @@ // log mixer settings y2milestone("Mixer (%1): %2", when, SCR::Execute(.target.bash_output, "/usr/bin/amixer")); y2milestone("volume_settings: %1", Sound::volume_settings); - y2milestone("asound size: %1", SCR::Read(.target.size, "/etc/asound.state")); + y2milestone("asound size: %1", SCR::Read(.target.size, Sound::asound_state())); } define boolean install_packages(list<string> modules) @@ -279,7 +279,7 @@ Progress::NextStage(); // initialize mixer settings - if (Mode::installation() || SCR::Read(.target.size, "/etc/asound.state") == -1 || Sound::write_only) + if (Mode::installation() || SCR::Read(.target.size, Sound::asound_state()) == -1 || Sound::write_only) { integer i = 0; maplist (map e, (list<map>) save_info, ``{ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68022 - /tags/stable-2_22_2/ca-management/
by mcalmer＠svn2.opensuse.org 25 Apr '12

25 Apr '12

Author: mcalmer Date: Wed Apr 25 11:19:25 2012 New Revision: 68022 URL: http://svn.opensuse.org/viewcvs/yast?rev=68022&view=rev Log: Created tag stable-2_22_2 for ca-management Added: tags/stable-2_22_2/ca-management/ (props changed) - copied from r68021, trunk/ca-management/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68021 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes src/util.ycp
by mcalmer＠svn2.opensuse.org 25 Apr '12

25 Apr '12

Author: mcalmer Date: Wed Apr 25 11:19:14 2012 New Revision: 68021 URL: http://svn.opensuse.org/viewcvs/yast?rev=68021&view=rev Log: - version 2.22.2 - Add details to hostname warning while exporting a common server certificate (bnc#756014) Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/util.ycp Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=68021&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Wed Apr 25 11:19:14 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Wed Apr 25 11:19:14 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 25 11:08:23 CEST 2012 - mc(a)suse.de + +- version 2.22.2 +- Add details to hostname warning while exporting a + common server certificate (bnc#756014) + +------------------------------------------------------------------- Thu Mar 29 14:09:43 CEST 2012 - jsuchome(a)suse.cz - merged proofed texts Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=6… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Wed Apr 25 11:19:14 2012 @@ -1205,7 +1205,9 @@ "), commonName, strip(retmap["stdout"]:"")); - Popup::Warning (errorString); + string details = _("The hostname of this server (command: hostname --long) have to match +either the common name of the certificate (CN) or on of the values in subject alternative names."); + Popup::WarningDetails (errorString, details); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68020 - in /trunk/sshd: VERSION package/yast2-sshd.changes src/sshd.desktop
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 16:38:30 2012 New Revision: 68020 URL: http://svn.opensuse.org/viewcvs/yast?rev=68020&view=rev Log: fixed desktop file. 2.22.0 Modified: trunk/sshd/VERSION trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/sshd.desktop Modified: trunk/sshd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/VERSION?rev=68020&r1=68019&… ============================================================================== --- trunk/sshd/VERSION (original) +++ trunk/sshd/VERSION Tue Apr 24 16:38:30 2012 @@ -1 +1 @@ -2.21.3 +2.22.0 Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Tue Apr 24 16:38:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 16:37:15 CEST 2012 - ug(a)suse.de + +- fixed schema definition in desktop file +- 2.22.0 + +------------------------------------------------------------------- Thu Mar 29 16:05:19 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/sshd/src/sshd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/sshd.desktop?rev=68020&… ============================================================================== --- trunk/sshd/src/sshd.desktop (original) +++ trunk/sshd/src/sshd.desktop Tue Apr 24 16:38:30 2012 @@ -16,6 +16,7 @@ X-SuSE-YaST-AutoInstResource=sshd X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan +X-SuSE-YaST-AutoInstSchema=sshd_config.rnc Icon=yast-sshd Exec=xdg-su -c "/sbin/yast2 sshd" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68019 - in /trunk/sound: ./ package/ sound/src/
by lslezak＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: lslezak Date: Tue Apr 24 16:19:16 2012 New Revision: 68019 URL: http://svn.opensuse.org/viewcvs/yast?rev=68019&view=rev Log: - reimplemented driver reloading ("rcalsasound reload" does not work with systemd) (bnc#751689) Added: trunk/sound/sound/src/alsadrivers (with props) trunk/sound/sound/src/joystickdrivers (with props) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Joystick.ycp trunk/sound/sound/src/Makefile.am trunk/sound/sound/src/routines.ycp trunk/sound/sound/src/sound_write.ycp trunk/sound/sound/src/volume_routines.ycp trunk/sound/yast2-sound.spec.in Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Apr 24 16:19:16 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 14:16:09 UTC 2012 - lslezak(a)suse.cz + +- reimplemented driver reloading ("rcalsasound reload" does not + work with systemd) (bnc#751689) + +------------------------------------------------------------------- Thu Mar 29 16:04:11 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/sound/sound/src/Joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Joystick.ycp?rev… ============================================================================== --- trunk/sound/sound/src/Joystick.ycp (original) +++ trunk/sound/sound/src/Joystick.ycp Tue Apr 24 16:19:16 2012 @@ -14,6 +14,9 @@ import "Mode"; import "Service"; + import "Directory"; + + const string joy_cmd = Directory::bindir + "/joystickdrivers"; /** * joystick config datastructure (list of maps) @@ -282,7 +285,9 @@ * Stop joystick service */ global define boolean Stop() ``{ - return Service::Stop("joystick"); + string cmd = joy_cmd + " unload"; + y2milestone("Executing: %1", cmd); + return SCR::Execute(.target.bash, cmd) == 0; } /** @@ -298,7 +303,11 @@ global define boolean StartAndEnable() ``{ if (start == "enable") - Service::Start("joystick"); + { + string cmd = joy_cmd + " load"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); + } Service::Adjust("joystick", start); return true; Modified: trunk/sound/sound/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Makefile.am?rev=… ============================================================================== --- trunk/sound/sound/src/Makefile.am (original) +++ trunk/sound/sound/src/Makefile.am Tue Apr 24 16:19:16 2012 @@ -38,7 +38,7 @@ PulseAudio.ycp \ Joystick.ycp -ybin_SCRIPTS = copyfonts +ybin_SCRIPTS = copyfonts alsadrivers joystickdrivers YCPCFLAGS = -I. Added: trunk/sound/sound/src/alsadrivers URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/alsadrivers?rev=… ============================================================================== --- trunk/sound/sound/src/alsadrivers (added) +++ trunk/sound/sound/src/alsadrivers Tue Apr 24 16:19:16 2012 @@ -0,0 +1,188 @@ +#!/bin/sh +# +# This script is based on the original /etc/init.d/alsasound +# and /usr/bin/setup-pulseaudio script. +# +# It was modified to a standalone script which works with systemd. +# +# From /etc/init.d/alsasound file: +# +# Copyright (c) by Jaroslav Kysela <perex(a)suse.cz> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# Modified to visually fit into SuSE 6.0+ by Philipp Thomas <pthomas(a)suse.de> +# further improvements by Bernd Kaindl, Olaf Hering and Takashi Iwai. +# +# +# Transformed to a standalone script by Ladislav Slezak, 2012 +# + +alsactl=/usr/sbin/alsactl +asoundcfg=/var/lib/alsa/asound.state +aconnect=/usr/bin/aconnect + +. /etc/sysconfig/sound + +# +# insert sequencer modules +# +load_sequencer() { + test "$LOAD_SEQUENCER" = "yes" && modprobe -q snd-seq + if [ x"$LOAD_SEQUENCER" = xyes -a -r /proc/asound/seq/drivers ]; then + OLDIFS="$IFS" + IFS="," + while read t x c; do + echo "Loading module $t" + /sbin/modprobe $t + done < /proc/asound/seq/drivers + IFS="$OLDIFS" + fi +} + +get_drivers() { + /sbin/modprobe -c | \ + grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \ + while read a b card; do + echo $card + done +} + +# +# insert all sound modules +# +load_modules() { + module_loaded=0 + drivers=`get_drivers` + for i in $drivers; do + if [ $i != off ]; then + echo "Loading module $i" + /sbin/modprobe $i && module_loaded=1 + fi + done + + test $module_loaded -eq 0 && return 1 + return 0 +} + +# +# rest of start action +# +start_rest() { + load_sequencer + if [ x"$LOAD_OSS_EMUL_MODULES" = xyes ]; then + /sbin/modprobe snd-pcm-oss + test x"$LOAD_OSS_SEQ_MODULE" = xyes && /sbin/modprobe snd-seq-oss + fi +} + +# manual load and force to store the status +start_all() { + echo "Starting sound driver..." + load_modules && start_rest +} + +do_kill() { + fuser $* /dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ + /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi* /dev/mixer* /dev/music \ + /dev/patmgr* /dev/sequencer* /dev/sndstat >/dev/null 2>&1 + if [ -d /dev/snd ]; then + fuser $* /dev/snd/* >/dev/null 2>&1 + fi +} + +terminate() { + # + # Kill processes holding open sound devices + # + do_kill -TERM -k + sleep 1 + do_kill -k + + # + # remove all sequencer connections if any + # + if [ -f /proc/asound/seq/clients -a -x $aconnect ]; then + $aconnect --removeall + fi +} + +# mute master to avoid clicks at unload/shutdown +mute_system() { + /usr/bin/amixer set Master mute >/dev/null 2>&1 +} + +# +# remove all sound modules +# +unload_modules() { + mute_system + mod=$(grep -m1 -E '^(snd[^ ]*|ac97_bus) [0-9]+ 0' /proc/modules) + while [ -n "$mod" ]; do + mod=${mod%% *} + echo "Removing module $mod" + /sbin/modprobe -r $mod + mod=$(grep -m1 -E '^(snd[^ ]*|ac97_bus) [0-9]+ 0' /proc/modules) + done +} + +unload_all() { + echo "Shutting down sound driver..." + + pa_disabled="no" + if grep -q "^[ \t]*autospawn[ \t]*=[ \t]*yes" /etc/pulse/client.conf; then + echo "Temporarily disabling PulseAudio autospawn" + sed -i -e "s|^[ \t]*autospawn.*|autospawn = no|g" /etc/pulse/client.conf + pa_disabled="yes" + fi + + terminate + unload_modules + + if [ $pa_disabled == "yes" ]; then + echo "Reenabling PulseAudio autospawn" + sed -i -e "s|^[ \t]*autospawn.*|autospawn = yes|g" /etc/pulse/client.conf + fi +} + +stop_all() { + if [ -d /proc/asound ]; then + $alsactl -g -f $asoundcfg store + unload_all + echo + fi +} + +# See how we were called. +case "$1" in + load) + start_all + ;; + unload) + test -d /proc/asound && unload_all + ;; + reload) + stop_all + start_all + ;; + *) + echo "Usage: $0 {load|unload|reload}" + echo + echo "This script loads/unloads ALSA kernel drivers configured in modprobe" + echo "configuration (usually stored in /etc/modprobe.d/50-sound.conf file)." + exit 1 + ;; +esac + Added: trunk/sound/sound/src/joystickdrivers URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joystickdrivers?… ============================================================================== --- trunk/sound/sound/src/joystickdrivers (added) +++ trunk/sound/sound/src/joystickdrivers Tue Apr 24 16:19:16 2012 @@ -0,0 +1,87 @@ +#! /bin/bash +# +# This script is based on the original /etc/init.d/joystick initscript/ +# +# It was modified to a standalone script which works with systemd. +# +# From /etc/init.d/joystick file: +# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany. +# +# Author: Takashi Iwai <tiwai(a)suse.de>, 2001 +# +# Transformed to a standalone script by Ladislav Slezak, 2012 +# + +. /etc/sysconfig/joystick + +alsactl=/usr/sbin/alsactl +if [ -x /sbin/lsmod ]; then + lsmod=/sbin/lsmod +else + lsmod=/bin/lsmod +fi + +# load joystick drivers +function load () { + # first load joydev module + if [ -z "${JOYSTICK_MODULE_0}${JOYSTICK_MODULE_1}${JOYSTICK_MODULE_2}${JOYSTICK_MODULE_3}" ]; then + echo "No joystick configured" + return + fi + + /sbin/modprobe joydev + for js in 0 1 2 3; do + # load gameport module + eval jsmod=\$GAMEPORT_MODULE_$js + if [ -n "$jsmod" -a "$jsmod" != off ]; then + echo "Loading gameport module $jsmod" + /sbin/modprobe $jsmod >/dev/null 2>&1 + fi + # load joystick moulde + eval jsdev=\$JOYSTICK_MODULE_$js + eval jsdev_opts=\$JOYSTICK_MODULE_OPTION_$js + if [ -n "$jsdev" -a "$jsdev" != off ]; then + echo "Loading joystick module $jsdev" + /sbin/modprobe $jsdev $jsdev_opts >/dev/null 2>&1 + fi + done +} + +function unload () { + for js in 0 1 2 3; do + # remove gameport module + eval jsmod=\$GAMEPORT_MODULE_$js + if [ -n "$jsmod" -a "$jsmod" != off ]; then + echo "Removing gameport module $jsmod" + /sbin/modprobe -r $jsmod + fi + # remove joystick moulde + eval jsdev=\$JOYSTICK_MODULE_$js + if [ -n "$jsdev" -a "$jsdev" != off ]; then + echo "Removing joystick module $jsdev" + /sbin/modprobe -r $jsdev + fi + done +} + +# See how we were called. +case "$1" in + load) + echo "Loading joystick drivers..." + load + ;; + unload) + # Stop daemons. + echo "Removing joystick drivers..." + unload + ;; + reload) + unload + load + ;; + *) + echo "Usage: $0 {load|unload|reload}" + exit 1 + ;; +esac + Modified: trunk/sound/sound/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/routines.ycp?rev… ============================================================================== --- trunk/sound/sound/src/routines.ycp (original) +++ trunk/sound/sound/src/routines.ycp Tue Apr 24 16:19:16 2012 @@ -947,8 +947,9 @@ y2milestone("Device unmounted: %1", umount_device(mpoint)); // restart ALSA after SoundFont copy - y2milestone("Restarting ALSA: %1", - SCR::Execute(.target.bash, "/etc/init.d/alsasound reload")); + string cmd = Directory::bindir + "/alsadrivers reload"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); } // step4: Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?… ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Tue Apr 24 16:19:16 2012 @@ -73,10 +73,14 @@ import "Package"; import "Mode"; import "Report"; + import "Directory"; import "Sound"; import "Joystick"; + const string joy_cmd = Directory::bindir + "/joystickdrivers"; + const string alsa_cmd = Directory::bindir + "/alsadrivers"; + define void logmixer(string when) { // log mixer settings y2milestone("Mixer (%1): %2", when, SCR::Execute(.target.bash_output, "/usr/bin/amixer")); @@ -259,12 +263,16 @@ if (!Sound::write_only) { // stop joystick before restarting ALSA - SCR::Execute(.target.bash, "/etc/init.d/joystick stop", $[]); + string cmd = joy_cmd + " unload"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); // restart ALSA if (size(configuredcards) > 0) { - SCR::Execute(.target.bash, "/etc/init.d/alsasound reload", $[]); + cmd = alsa_cmd + " reload"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); } } Modified: trunk/sound/sound/src/volume_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/volume_routines.… ============================================================================== --- trunk/sound/sound/src/volume_routines.ycp (original) +++ trunk/sound/sound/src/volume_routines.ycp Tue Apr 24 16:19:16 2012 @@ -195,8 +195,9 @@ if (Sound::use_alsa) { - SCR::Execute (.target.bash, - "/etc/init.d/alsasound unload > /dev/null 2>&1", $[]); + string cmd = Directory::bindir + "/alsadrivers unload"; + y2milestone("Executing: %1", cmd); + SCR::Execute(.target.bash, cmd); boolean aoa_used = false; foreach(map card, Sound::modules_conf, Modified: trunk/sound/yast2-sound.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/yast2-sound.spec.in?rev=68… ============================================================================== --- trunk/sound/yast2-sound.spec.in (original) +++ trunk/sound/yast2-sound.spec.in Tue Apr 24 16:19:16 2012 @@ -48,6 +48,8 @@ @desktopdir@/sound.desktop @desktopdir@/joystick.desktop @ybindir@/copyfonts +@ybindir@/alsadrivers +@ybindir@/joystickdrivers @moduledir@/Sound.* @moduledir@/Joystick.* @moduledir@/PulseAudio.* -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68018 - in /trunk/audit-laf: VERSION package/yast2-audit-laf.changes
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 16:17:36 2012 New Revision: 68018 URL: http://svn.opensuse.org/viewcvs/yast?rev=68018&view=rev Log: 2.22.2 Modified: trunk/audit-laf/VERSION trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/VERSION?rev=68018&r1=6… ============================================================================== --- trunk/audit-laf/VERSION (original) +++ trunk/audit-laf/VERSION Tue Apr 24 16:17:36 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Tue Apr 24 16:17:36 2012 @@ -2,6 +2,7 @@ Tue Apr 24 15:34:00 CEST 2012 - ug(a)suse.de - fixed desktop file for autoyast +- 2.22.2 ------------------------------------------------------------------- Thu Mar 29 13:50:48 CEST 2012 - jsuchome(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68017 - in /trunk/schema: VERSION package/yast2-schema.changes scripts/collect.sh
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 16:13:09 2012 New Revision: 68017 URL: http://svn.opensuse.org/viewcvs/yast?rev=68017&view=rev Log: added workaround for pxe.rnc Modified: trunk/schema/VERSION trunk/schema/package/yast2-schema.changes trunk/schema/scripts/collect.sh Modified: trunk/schema/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/VERSION?rev=68017&r1=6801… ============================================================================== --- trunk/schema/VERSION (original) +++ trunk/schema/VERSION Tue Apr 24 16:13:09 2012 @@ -1 +1 @@ -2.18.2 +2.22.0 Modified: trunk/schema/package/yast2-schema.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/package/yast2-schema.chan… ============================================================================== --- trunk/schema/package/yast2-schema.changes (original) +++ trunk/schema/package/yast2-schema.changes Tue Apr 24 16:13:09 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 16:00:17 CEST 2012 - ug(a)suse.de + +- fix for pxe.rnc from the autoyast package +- 2.22.0 + +------------------------------------------------------------------- Tue Apr 24 15:41:04 CEST 2012 - ug(a)suse.de - added yast2-online-update-configuration to Modified: trunk/schema/scripts/collect.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/scripts/collect.sh?rev=68… ============================================================================== --- trunk/schema/scripts/collect.sh (original) +++ trunk/schema/scripts/collect.sh Tue Apr 24 16:13:09 2012 @@ -45,6 +45,13 @@ resource="user_defaults? & groups? & login_settings? & users" fi + # same hack as for users. pxe.rnc is part of autoyast but has no client + if [ "$resource" = "general" ]; then + resource="general? & pxe" + cp $SCHEMA_DIR/pxe.rnc $RNC_OUTPUT + echo "include 'pxe.rnc'" >> $RNC_OUTPUT/includes.rnc + fi + if [ ! -z "${X_SuSE_YaST_AutoInstSchema}" ]; then cp $SCHEMA_DIR/${X_SuSE_YaST_AutoInstSchema} $RNC_OUTPUT -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68016 - /trunk/schema/package/yast2-schema.changes
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 15:41:23 2012 New Revision: 68016 URL: http://svn.opensuse.org/viewcvs/yast?rev=68016&view=rev Log: added missing BuildRequires Modified: trunk/schema/package/yast2-schema.changes Modified: trunk/schema/package/yast2-schema.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/package/yast2-schema.chan… ============================================================================== --- trunk/schema/package/yast2-schema.changes (original) +++ trunk/schema/package/yast2-schema.changes Tue Apr 24 15:41:23 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 15:41:04 CEST 2012 - ug(a)suse.de + +- added yast2-online-update-configuration to + BUILDREQUIRES + +------------------------------------------------------------------- Tue Sep 8 10:24:34 CEST 2009 - mvidner(a)suse.cz - Build fix: Eval only X-SuSE-YaST-AutoInst*, not X-SuSE-YaST-Keywords. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68015 - /trunk/schema/yast2-schema.spec.in
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 15:40:52 2012 New Revision: 68015 URL: http://svn.opensuse.org/viewcvs/yast?rev=68015&view=rev Log: added missing BuildRequires Modified: trunk/schema/yast2-schema.spec.in Modified: trunk/schema/yast2-schema.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/yast2-schema.spec.in?rev=… ============================================================================== --- trunk/schema/yast2-schema.spec.in (original) +++ trunk/schema/yast2-schema.spec.in Tue Apr 24 15:40:52 2012 @@ -6,7 +6,13 @@ Group: System/YaST License: GPL-2.0+ -BuildRequires: java2-devel-packages trang yast2-all-packages +# FIXME: drop yast2-all-packages some day +BuildRequires: java2-devel-packages trang yast2-all-packages + +# not covered by yast2-all-packages +BuildRequires: yast2-online-update-configuration + + # yast2-core omited from some reason in buildservice, adding explicitly BuildRequires: yast2-core #!BuildIgnore: yast2-build-test yast2-online-update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0