de6548f538
Mon Dec 09 2002 Tim Waugh <twaugh@redhat.com> 4.5.3-7 - Fix mv (bug #79283). - Add patch27 (nogetline). Sun Dec 01 2002 Tim Powers <timp@redhat.com> 4.5.3-6 - use the su.pamd from sh-utils since it works properly with multilib systems Fri Nov 29 2002 Tim Waugh <twaugh@redhat.com> 4.5.3-5 - Fix test suite quoting problems. Fri Nov 29 2002 Tim Waugh <twaugh@redhat.com> 4.5.3-4 - Fix scriplets. - Fix i18n patch so it doesn't break uniq. - Fix several other patches to either make the test suite pass or not run the relevant tests. - Run 'make check'. - Fix file list. Thu Nov 28 2002 Tim Waugh <twaugh@redhat.com> 4.5.3-3 - Adapted for Red Hat Linux. - Self-host for help2man. - Don't ship readlink just yet (maybe later). - Merge patches from fileutils and sh-utils (textutils ones are already merged it seems). - Keep the binaries where the used to be (in particular, id and stat). Sun Nov 17 2002 Stew Benedict <sbenedict@mandrakesoft.com> 4.5.3-2mdk - LI18NUX/LSB compliance (patch800) - Installed (but unpackaged) file(s) - /usr/share/info/dir Thu Oct 31 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.3-1mdk - new release - rediff patch 180 - merge patch 150 into 180 Mon Oct 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-6mdk - move su back to /bin Mon Oct 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-5mdk - patch 0 : lg locale is illegal and must be renamed lug (pablo) Mon Oct 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-4mdk - fix conflict with procps Mon Oct 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-3mdk - patch 105 : fix install -s Mon Oct 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-2mdk - fix build - don't chmode two times su - build with large file support - fix description - various spec cleanups - fix chroot installation - fix missing /bin/env - add old fileutils, sh-utils & textutils ChangeLogs Fri Oct 11 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 4.5.2-1mdk - initial release (merge fileutils, sh-utils & textutils) - obsoletes/provides: sh-utils/fileutils/textutils - fileutils stuff go in 1xx range - sh-utils stuff go in 7xx range - textutils stuff go in 5xx range - drop obsoletes patches 1, 2, 10 (somes files're gone but we didn't ship most of them) - rediff patches 103, 105, 111, 113, 180, 706 - temporary disable patch 3 & 4 - fix fileutils url
65 lines
1.6 KiB
Diff
65 lines
1.6 KiB
Diff
--- coreutils-4.5.3/src/uname.c.sysinfo 2002-08-31 09:52:11.000000000 +0100
|
|
+++ coreutils-4.5.3/src/uname.c 2002-11-28 18:29:15.000000000 +0000
|
|
@@ -232,7 +232,7 @@
|
|
if (toprint & PRINT_KERNEL_RELEASE)
|
|
print_element (name.release);
|
|
if (toprint & PRINT_KERNEL_VERSION)
|
|
- print_element (name.version);
|
|
+ print_element (name.version);
|
|
if (toprint & PRINT_MACHINE)
|
|
print_element (name.machine);
|
|
}
|
|
@@ -246,6 +246,28 @@
|
|
if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
|
|
element = processor;
|
|
}
|
|
+#else
|
|
+ {
|
|
+ struct utsname u;
|
|
+ uname(&u);
|
|
+ element = u.machine;
|
|
+#ifdef linux
|
|
+ if(!strcmp(element, "i686")) { /* Check for Athlon */
|
|
+ char cinfo[1024];
|
|
+ FILE *f=fopen("/proc/cpuinfo", "r");
|
|
+ if(f) {
|
|
+ while(fgets(cinfo, 1024, f)) {
|
|
+ if(!strncmp(cinfo, "vendor_id", 9)) {
|
|
+ if(strstr(cinfo, "AuthenticAMD"))
|
|
+ element="athlon";
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ fclose(f);
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+ }
|
|
#endif
|
|
#ifdef UNAME_PROCESSOR
|
|
if (element == unknown)
|
|
@@ -262,7 +284,7 @@
|
|
|
|
if (toprint & PRINT_HARDWARE_PLATFORM)
|
|
{
|
|
- char const *element = unknown;
|
|
+ char *element = unknown;
|
|
#if HAVE_SYSINFO && defined SI_PLATFORM
|
|
{
|
|
static char hardware_platform[257];
|
|
@@ -270,6 +292,14 @@
|
|
hardware_platform, sizeof hardware_platform))
|
|
element = hardware_platform;
|
|
}
|
|
+#else
|
|
+ {
|
|
+ struct utsname u;
|
|
+ uname(&u);
|
|
+ element = u.machine;
|
|
+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
|
|
+ element[1]='3';
|
|
+ }
|
|
#endif
|
|
#ifdef UNAME_HARDWARE_PLATFORM
|
|
if (element == unknown)
|