folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) fixed some HP specific typos 

2) uname() rseults get pushed through *_canon tables before being used

CVS patchset: 1819
CVS date: 1997/09/12 19:09:07
This commit is contained in:
ewt 1997-09-12 19:09:07 +00:00
parent 6558956b6e
commit a74c005013
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
scripts (Donnie Barnes)
- didn't package / properly
- pre/post script processing had some erroneous free() calls
- fixed typos for HP archs in lib/rpmrc.c
- uname() results should go through *_canon tables before anything
else happens
2.4.5 -> 2.4.6:
- added os_canon entries for BSD/OS and NextStep

26
lib/rpmrc.c
View File

@ -661,6 +661,7 @@ static void defaultMachine(char ** arch, char ** os) {
static struct utsname un;
static int gotDefaults = 0;
char * chptr;
struct canonEntry * canon;
if (!gotDefaults) {
uname(&un);
@ -681,31 +682,44 @@ static void defaultMachine(char ** arch, char ** os) {
#if defined(CPU_HP_MC68020)
if (cpu_version == CPU_HP_MC68020)
strcpy(us.machine, "m68k");
strcpy(un.machine, "m68k");
#endif
#if defined(CPU_HP_MC68030)
if (cpu_version == CPU_HP_MC68030)
strcpy(us.machine, "m68k");
strcpy(un.machine, "m68k");
#endif
#if defined(CPU_HP_MC68040)
if (cpu_version == CPU_HP_MC68040)
strcpy(us.machine, "m68k");
strcpy(un.machine, "m68k");
#endif
#if defined(CPU_PA_RISC1_0)
if (cpu_version == CPU_PA_RISC1_0)
strcpy(us.machine, "parisc");
strcpy(un.machine, "parisc");
#endif
#if defined(CPU_PA_RISC1_1)
if (cpu_version == CPU_PA_RISC1_1)
strcpy(us.machine, "parisc");
strcpy(un.machine, "parisc");
#endif
#if defined(CPU_PA_RISC1_2)
if (cpu_version == CPU_PA_RISC1_2)
strcpy(us.machine, "parisc");
strcpy(un.machine, "parisc");
#endif
}
#endif
/* the uname() result goes through the arch_canon table */
canon = lookupInCanonTable(un.machine,
tables[RPM_MACHTABLE_INSTARCH].canons,
tables[RPM_MACHTABLE_INSTARCH].canonsLength);
if (canon)
strcpy(un.machine, canon->short_name);
canon = lookupInCanonTable(un.sysname,
tables[RPM_MACHTABLE_INSTOS].canons,
tables[RPM_MACHTABLE_INSTOS].canonsLength);
if (canon)
strcpy(un.sysname, canon->short_name);
}
if (arch) *arch = un.machine;