d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend sysinstall to handle powerpc64 by teaching it that powerpc64 has

Browse Source 
a lib32 distribution, and that the GENERIC kernel is named GENERIC64.
More modifications will be required later for installations from ftp due
to the shared platform name with 32-bit powerpc, but this is enough for
snapshot CDs to work.

Reviewed by:	brucec
This commit is contained in:
Nathan Whitehorn 2010-10-03 17:50:43 +00:00
parent 5e34065c6c
commit e3d8cf496d
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/sysinstall/dist.c
View File

@ -87,7 +87,7 @@ static Distribution DistTable[] = {
DTE_TARBALL("proflibs", &Dists, PROFLIBS, "/"),
DTE_TARBALL("dict", &Dists, DICT, "/"),
DTE_TARBALL("info", &Dists, INFO, "/"),
#ifdef __amd64__
#if defined(__amd64__) || defined(__powerpc64__)
DTE_TARBALL("lib32", &Dists, LIB32, "/"),
#endif
DTE_SUBDIST("src", &Dists, SRC, SrcDistTable),
@ -98,7 +98,7 @@ static Distribution DistTable[] = {
/* The kernel distributions */
static Distribution KernelDistTable[] = {
DTE_TARBALL("GENERIC", &KernelDists, KERNEL_GENERIC, "/boot"),
DTE_TARBALL(GENERIC_KERNEL_NAME, &KernelDists, KERNEL_GENERIC, "/boot"),
DTE_END,
};

8
usr.sbin/sysinstall/dist.h
View File

@ -16,7 +16,7 @@
#define DIST_CATPAGES 0x00200
#define DIST_PORTS 0x00400
#define DIST_LOCAL 0x00800
#ifdef __amd64__
#if defined(__amd64__) || defined(__powerpc64__)
#define DIST_LIB32 0x01000
#endif
#define DIST_KERNEL 0x02000
@ -75,6 +75,12 @@
#define DIST_KERNEL_SMP 0x00002
#define DIST_KERNEL_ALL 0xFFFFF
#ifdef __powerpc64__
#define GENERIC_KERNEL_NAME "GENERIC64"
#else
#define GENERIC_KERNEL_NAME "GENERIC"
#endif
/* Canned distribution sets */
#define _DIST_USER \

2
usr.sbin/sysinstall/install.c
View File

@ -979,7 +979,7 @@ installFixupKernel(dialogMenuItem *self, int dists)
* already and the /boot/kernel we remove is empty.
*/
vsystem("rm -rf /boot/kernel");
vsystem("mv /boot/GENERIC /boot/kernel");
vsystem("mv /boot/" GENERIC_KERNEL_NAME " /boot/kernel");
}
return DITEM_SUCCESS | DITEM_RESTORE;
}

2
usr.sbin/sysinstall/menus.c
View File

@ -993,7 +993,7 @@ DMenu MenuSubDistributions = {
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
{ " info", "GNU info files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
#ifdef __amd64__
#if defined(__amd64__) || defined(__powerpc64__)
{ " lib32", "32-bit runtime compatibility libraries",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LIB32 },
#endif

2
usr.sbin/sysinstall/sysinstall.8
View File

@ -428,7 +428,7 @@ Dictionary information (for tools like spell).
.It Li info
GNU info files and other extra docs.
.It Li lib32
(amd64 only)
(amd64 and powerpc64 only)
32-bit runtime compatibility libraries.
.It Li ports
The ports collection.