Hi Bernard,
attached are three small patches to improve compatibility with
OpenSuSE 11.3:
- allow parted version numbers "a.b" in addition to "a.b.c"
- avoid non-initialized variable in si_getimage
- detect date format of OpenSuSE 11.3 kernels for UYOK
Best,
thomas
--- /usr/lib/systemimager/perl/SystemImager/Common.pm.orig 2011-04-05 21:02:17.563839014 +0200
+++ /usr/lib/systemimager/perl/SystemImager/Common.pm 2011-04-05 21:04:28.483846516 +0200
@@ -1687,7 +1687,8 @@
sub _get_parted_version {
$_ = `parted --version`;
- if(m/(\d+\.\d+\.\d+)/) {
+ # OpenSuSE 11.3 comes with "parted 2.2"
+ if(m/(\d+\.\d+(\.\d+)?)/) {
return $1;
}
--- /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm.orig 2011-04-05 21:10:00.716247902 +0200
+++ /usr/lib/systemimager/perl/SystemImager/UseYourOwnKernel.pm 2011-04-05 21:13:40.531838799 +0200
@@ -460,6 +460,8 @@
# 2.4.19-mantis-2002.11.20 (root@mantis) #6 Tue Nov 19 15:15:43 CST 2002
# 2.6.7-1-686 (dilin...@toaster.hq.voxel.net) #1 Thu Jul 8 05:36:53 EDT 2004
# 2.6.22.5-31-default (geeko@buildhost) #1 SMP 2007/09/21 22:29:00 UTC
+ # OpenSuSE 11.3:
+ # 2.6.34-12-default (geeko@buildhost) (gcc version 4.5.0 20100604 [gcc-4_5-branch revision 160292] (SUSE Linux) ) #1 SMP 2010-06-29 02:39:08 +0200
#
my $regex =
# | kernel version + build machine
@@ -468,11 +470,11 @@
#
# | build date
# `---------------------------------------
- '(\w{3} \w{3} \d{1,2}|\d{4}\/\d{2}\/\d{2}) '.
+ '(\w{3} \w{3} \d{1,2}|\d{4}[\/-]\d{2}[\/-]\d{2}) ' .
#
# | build time
# `---------------------------------------
- '\d{2}:\d{2}:\d{2} \w{3,4}( \d{4})?';
+ '\d{2}:\d{2}:\d{2} (\w{3,4}|\+\d{4})( \d{4})?';
while(<IN>) {
# extract the `uname -r` string from the kernel file
if(m/$regex/o) {
--- /usr/sbin/si_getimage.orig 2011-04-05 21:08:05.309463656 +0200
+++ /usr/sbin/si_getimage 2011-04-05 21:08:52.353173652 +0200
@@ -106,7 +106,7 @@
my $ip_assignment_method;
my $image;
my $exclude_file;
-my $update_script;
+my $update_script = "no"; # default to "no" (and avoid waring in line 139 if not set)
my $post_install = "beep"; # the default
# It is not intended that auto_install_script_conf be passable as an option on
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
sisuite-users mailing list
sisuite-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sisuite-users
