diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
| commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
| tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core/coreutils/coreutils-uname.patch | |
| parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
| download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 | |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core/coreutils/coreutils-uname.patch')
| -rw-r--r-- | abs/core/coreutils/coreutils-uname.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/abs/core/coreutils/coreutils-uname.patch b/abs/core/coreutils/coreutils-uname.patch index 93cb134..b458abe 100644 --- a/abs/core/coreutils/coreutils-uname.patch +++ b/abs/core/coreutils/coreutils-uname.patch @@ -11,11 +11,11 @@ func in the linux/arch/<ARCH>/ source tree of the kernel. --- coreutils/src/uname.c +++ coreutils/src/uname.c -@@ -51,6 +51,11 @@ +@@ -50,6 +50,11 @@ # include <mach-o/arch.h> #endif -+#if defined (__linux__) ++#if defined(__linux__) +# define USE_PROCINFO +# define UNAME_HARDWARE_PLATFORM +#endif @@ -63,7 +63,7 @@ func in the linux/arch/<ARCH>/ source tree of the kernel. + } +} + -+static int __linux_procinfo (int x, char *fstr, size_t s) ++static int __linux_procinfo(int x, char *fstr, size_t s) +{ + FILE *fp; + @@ -148,26 +148,26 @@ func in the linux/arch/<ARCH>/ source tree of the kernel. -#if HAVE_SYSINFO && defined SI_ARCHITECTURE +#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) { - static char processor[257]; + static char processor[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) +#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) +#endif - element = processor; + element = processor; } #endif @@ -306,9 +404,13 @@ main (int argc, char **argv) if (element == unknown) - { - static char hardware_platform[257]; + { + static char hardware_platform[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) +#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) +#endif - element = hardware_platform; - } + element = hardware_platform; + } #endif |