mirror of
				https://gitlab.alpinelinux.org/alpine/aports.git
				synced 2025-11-04 02:11:39 +01:00 
			
		
		
		
	testing/hardinfo: alpine and uclibc fixes
This commit is contained in:
		
							parent
							
								
									e88f93b450
								
							
						
					
					
						commit
						5b91c24555
					
				@ -1,7 +1,7 @@
 | 
			
		||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 | 
			
		||||
pkgname=hardinfo
 | 
			
		||||
pkgver=0.5.1
 | 
			
		||||
pkgrel=2
 | 
			
		||||
pkgrel=3
 | 
			
		||||
pkgdesc="A system information and benchmark tool."
 | 
			
		||||
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 | 
			
		||||
arch="all"
 | 
			
		||||
@ -10,13 +10,18 @@ makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1"
 | 
			
		||||
depends=
 | 
			
		||||
source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2
 | 
			
		||||
	fixsensors.patch
 | 
			
		||||
	uclibc.patch
 | 
			
		||||
	hardinfo-alpine.patch"
 | 
			
		||||
 | 
			
		||||
_builddir="$srcdir"/$pkgname-$pkgver
 | 
			
		||||
prepare() {
 | 
			
		||||
	cd "$_builddir"
 | 
			
		||||
	patch -p1 -i "$srcdir"/fixsensors.patch || return 1
 | 
			
		||||
	patch -p1 -i "$srcdir"/hardinfo-alpine.patch || return 1
 | 
			
		||||
	for i in $source; do
 | 
			
		||||
		case $i in
 | 
			
		||||
		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 | 
			
		||||
		esac
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
	# configure scrip says bash but bb ash works just fine
 | 
			
		||||
	sed -i -e '1,1s/bash/sh/' configure
 | 
			
		||||
}
 | 
			
		||||
@ -35,4 +40,5 @@ package() {
 | 
			
		||||
}
 | 
			
		||||
md5sums="6fb38992e140f2fab16518ae1f38e188  hardinfo-0.5.1.tar.bz2
 | 
			
		||||
05c212db07b9f152cdea052ff7bb28fa  fixsensors.patch
 | 
			
		||||
ae8d38e5b35fb2c9c5f425dde3ba27cb  hardinfo-alpine.patch"
 | 
			
		||||
e5dfccb5d3cb46acd36072f9e2396ff4  uclibc.patch
 | 
			
		||||
41651eb55dc219b6d9c279227a17514a  hardinfo-alpine.patch"
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,7 @@
 | 
			
		||||
 static struct {
 | 
			
		||||
     gchar *file, *codename;
 | 
			
		||||
 } distro_db[] = {
 | 
			
		||||
+    { DB_PREFIX "alpine-version",	"al"  },
 | 
			
		||||
+    { DB_PREFIX "alpine-release",	"al"  },
 | 
			
		||||
     { DB_PREFIX "debian_version",	"deb"  },
 | 
			
		||||
     { DB_PREFIX "slackware-version",	"slk"  },
 | 
			
		||||
     { DB_PREFIX "mandrake-release",	"mdk"  },
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										22
									
								
								testing/hardinfo/uclibc.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								testing/hardinfo/uclibc.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,22 @@
 | 
			
		||||
diff --git a/arch/linux/common/os.h b/arch/linux/common/os.h
 | 
			
		||||
index f3c2c2d..78bc78b 100644
 | 
			
		||||
--- a/arch/linux/common/os.h
 | 
			
		||||
+++ b/arch/linux/common/os.h
 | 
			
		||||
@@ -49,6 +49,9 @@ err:
 | 
			
		||||
 static gchar *
 | 
			
		||||
 get_libc_version(void)
 | 
			
		||||
 {
 | 
			
		||||
+#if defined(__UCLIBC__)
 | 
			
		||||
+    return g_strdup("uClibc");
 | 
			
		||||
+#else
 | 
			
		||||
     FILE *libc;
 | 
			
		||||
     gchar buf[256], *tmp, *p;
 | 
			
		||||
     
 | 
			
		||||
@@ -70,6 +73,7 @@ get_libc_version(void)
 | 
			
		||||
                            strstr(buf, " stable ") ? "" : "un");
 | 
			
		||||
   err:
 | 
			
		||||
     return g_strdup("Unknown");
 | 
			
		||||
+#endif
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
 static gchar *
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user