wok-4.x rev 726

Hardinfo: fix os
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri May 02 21:12:50 2008 +0000 (2008-05-02)
parents 67255ebad6ce
children 69813a32bee3
files hardinfo/receipt hardinfo/stuff/os.patch
line diff
     1.1 --- a/hardinfo/receipt	Fri May 02 23:00:08 2008 +0200
     1.2 +++ b/hardinfo/receipt	Fri May 02 21:12:50 2008 +0000
     1.3 @@ -14,10 +14,15 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 -	patch -p0 < ../stuff/modules.patch  || exit 1
     1.8 -	patch -p0 < ../stuff/users.patch  || exit 1
     1.9 -	patch -p0 < ../stuff/languages.patch  || exit 1
    1.10 -	patch -p0 < ../stuff/boots.patch  || exit 1
    1.11 +	while read file; do
    1.12 +		patch -p0 < ../stuff/$file || exit 1
    1.13 +	done <<EOT
    1.14 +modules.patch
    1.15 +users.patch
    1.16 +languages.patch
    1.17 +boots.patch
    1.18 +os.patch
    1.19 +EOT
    1.20  	./configure \
    1.21  		--prefix=/usr \
    1.22  		$CONFIGURE_ARGS
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/hardinfo/stuff/os.patch	Fri May 02 21:12:50 2008 +0000
     2.3 @@ -0,0 +1,23 @@
     2.4 +--- computer.h	2008-05-02 13:32:10.000000000 +0200
     2.5 ++++ computer.h	2008-05-02 13:34:31.000000000 +0200
     2.6 +@@ -23,6 +23,7 @@
     2.7 + static struct {
     2.8 +     gchar *file, *codename;
     2.9 + } distro_db[] = {
    2.10 ++    { DB_PREFIX "slitaz-release",	"slitaz" },
    2.11 +     { DB_PREFIX "debian_version",	"deb"  },
    2.12 +     { DB_PREFIX "slackware-version",	"slk"  },
    2.13 +     { DB_PREFIX "mandrake-release",	"mdk"  },
    2.14 +--- arch/linux/common/os.h	2008-05-02 13:43:33.000000000 +0200
    2.15 ++++ arch/linux/common/os.h	2008-05-02 13:44:49.000000000 +0200
    2.16 +@@ -181,6 +181,10 @@
    2.17 + 		    ((buf[0] >= '0' && buf[0] <= '9') || buf[0] != 'D')) {
    2.18 + 		    os->distro = g_strdup_printf
    2.19 + 			("Debian GNU/Linux %s", buf);
    2.20 ++		}
    2.21 ++		else if (!strncmp(distro_db[i].codename, "slitaz", 6)) {
    2.22 ++		    os->distro = g_strdup_printf
    2.23 ++			("Slitaz GNU/Linux %s", buf);
    2.24 + 		} else {
    2.25 + 		    os->distro = g_strdup(buf);
    2.26 + 		}