Hello community,
here is the log from the commit of package yast2-network
checked in at Wed Nov 29 15:44:38 CET 2006.
--------
--- yast2-network/yast2-network.changes 2006-11-27 10:45:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/yast2-network/yast2-network.changes 2006-11-29 15:03:28.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Nov 29 10:50:02 CET 2006 - kmachalkova@suse.cz
+
+- Correct check for availability of wireless firmware packages
+ (#223871)
+- 2.14.12
+
+-------------------------------------------------------------------
+Mon Nov 27 14:09:18 CET 2006 - kmachalkova@suse.cz
+
+- Do not attempt to configure wlan card requiring firmware before
+ the firmware is installed (#221235)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.14.11.tar.bz2
New:
----
yast2-network-2.14.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.1bkUff/_old 2006-11-29 15:44:18.000000000 +0100
+++ /var/tmp/diff_new_pack.1bkUff/_new 2006-11-29 15:44:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.14.11)
+# spec file for package yast2-network (Version 2.14.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.14.11
+Version: 2.14.12
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.14.11.tar.bz2
+Source0: yast2-network-2.14.12.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -27,7 +27,8 @@
Requires: yast2-core >= 2.10.6
# String::Random
# Linuxrc::display_ip
-Requires: yast2 >= 2.14.9
+# NetworkDevices::FindFastest
+Requires: yast2 >= 2.14.13
Requires: sysconfig yast2-country yast2-inetd yast2-packager
PreReq: /bin/rm
Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
@@ -50,7 +51,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.14.11
+%setup -n yast2-network-2.14.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +107,13 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog -n yast2-network
+* Wed Nov 29 2006 - kmachalkova@suse.cz
+- Correct check for availability of wireless firmware packages
+ (#223871)
+- 2.14.12
+* Mon Nov 27 2006 - kmachalkova@suse.cz
+- Do not attempt to configure wlan card requiring firmware before
+ the firmware is installed (#221235)
* Mon Nov 27 2006 - mzugec@suse.cz
- #223136 - don't modprobe blacklisted modules
- 2.14.11
++++++ yast2-network-2.14.11.tar.bz2 -> yast2-network-2.14.12.tar.bz2 ++++++
++++ 12335 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-network-2.14.11/Makefile.am new/yast2-network-2.14.12/Makefile.am
--- old/yast2-network-2.14.11/Makefile.am 2006-11-27 10:27:28.000000000 +0100
+++ new/yast2-network-2.14.12/Makefile.am 2006-11-29 14:24:26.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
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-network-2.14.11/Makefile.am.common new/yast2-network-2.14.12/Makefile.am.common
--- old/yast2-network-2.14.11/Makefile.am.common 2006-11-27 10:27:28.000000000 +0100
+++ new/yast2-network-2.14.12/Makefile.am.common 2006-11-29 14:24:26.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
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-network-2.14.11/VERSION new/yast2-network-2.14.12/VERSION
--- old/yast2-network-2.14.11/VERSION 2006-11-27 10:43:13.000000000 +0100
+++ new/yast2-network-2.14.12/VERSION 2006-11-29 14:26:20.000000000 +0100
@@ -1 +1 @@
-2.14.11
+2.14.12
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-network-2.14.11/configure.in new/yast2-network-2.14.12/configure.in
--- old/yast2-network-2.14.11/configure.in 2006-11-27 10:27:28.000000000 +0100
+++ new/yast2-network-2.14.12/configure.in 2006-11-29 14:24:26.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.14.10, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.14.11, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.10"
+VERSION="2.14.11"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
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-network-2.14.11/src/lan/complex.ycp new/yast2-network-2.14.12/src/lan/complex.ycp
--- old/yast2-network-2.14.11/src/lan/complex.ycp 2006-11-03 09:36:41.000000000 +0100
+++ new/yast2-network-2.14.12/src/lan/complex.ycp 2006-11-29 14:54:10.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 33999 2006-11-03 08:36:36Z kmachalkova $
+ * $Id: complex.ycp 34638 2006-11-29 13:54:08Z kmachalkova $
*/
{
@@ -28,7 +28,6 @@
import "Label";
import "Product";
-import "Pkg";
import "Package";
include "network/routines.ycp";
@@ -291,7 +290,24 @@
* @return whether to proceed with editing and commiting the config
*/
define boolean AddInterface (integer hwid) {
- list <string> firmwares = ["ipw-firmware", "atmel-firmware", "qlogic-firmware"];
+ //this is the map of kernel modules vs. requested firmware
+ //non-empty keys are firmware packages shipped by SUSE
+ map request_firmware = $[
+ "atmel_pci" : "atmel-firmware",
+ "atmel_cs" : "atmel-firmware",
+ "bcm43xx" : "",
+ "ipw2100" : "ipw-firmware",
+ "ipw2200" : "ipw-firmware",
+ "prism54" : "",
+ "spectrum_cs" : "",
+ "zd1201" : "",
+ "zd1211rw" : "",
+ "acx" : "",
+ "at76_usb" : "atmel-firmware",
+ "ipw3945" : "ipw-firmware",
+ "rt61pci" : "",
+ "rt73usb" : "",
+ ];
Lan::Add ();
Lan::SelectHW (hwid);
@@ -307,30 +323,34 @@
return false;
}
}
- // this is one of 3 places to install packages :-(
- // - kernel modules (InstallKernel): before loaded
- // - smpppd & kinternet: before net start
- // - wlan firmware: here, just because it is copied from modems
- // #45960
- if(Lan::Requires != [] && Lan::Requires != nil) {
- boolean found = false;
- foreach(string fw, firmwares, {
- if(contains(Lan::Requires, fw)){
+ else if(haskey(request_firmware, NetworkModules::Alias)){
+ string fw = request_firmware[NetworkModules::Alias]:"";
+ if (fw != ""){
+ if ((!Package::Installed(fw) && !Package::Available(fw))){
+
//check if package with the firmware is available
//i.e. if there are any inst. sources defined
//and if the package is available on any of them
- if ((Pkg::SourceGetCurrent(true) == []) || !Package::Available(fw)){
- Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
+
+ Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST installation sources and return
to this configuration dialog."), Product::name));
- found = true;
- break;
- };
+ return false;
}
- });
- if (found)
- return false;
-
+ }
+ else {
+ return (Popup::ContinueCancel(_("The device needs a firmware to function properly. It can be usually downloaded
+from your driver vendor web page.\nIf you have already downloaded and installed the firmware, click \'Continue\'
+to configure the device. Otherwise click \'Cancel\' and return to this dialog
+once you have installed the firmware.")));
+ }
+ }
+ // this is one of 3 places to install packages :-(
+ // - kernel modules (InstallKernel): before loaded
+ // - smpppd & kinternet: before net start
+ // - wlan firmware: here, just because it is copied from modems
+ // #45960
+ if(Lan::Requires != [] && Lan::Requires != nil) {
if(PackagesInstall(Lan::Requires) != `next)
return false;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org