Get powerpc64 install CDs a little closer: some powerpc things should be
used on powerpc64 as well (build scripts, for instance), and the MFS root must be adjusted upward on powerpc64 as well. This doesn't completely solve things: sysinstall stil needs some persuasion to deal with a default kernel named GENERIC64.
This commit is contained in:
parent
b82b0cb2b1
commit
0dd04e5470
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=210097
@ -105,9 +105,11 @@ SVNBRANCH= head
|
||||
|
||||
TARGET_ARCH?= ${MACHINE_ARCH}
|
||||
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
|
||||
TARGET?= ${MACHINE}
|
||||
TARGET?= ${MACHINE}
|
||||
TARGET_CPUARCH?= ${MACHINE_CPUARCH}
|
||||
.else
|
||||
TARGET?= ${TARGET_ARCH}
|
||||
TARGET?= ${TARGET_ARCH}
|
||||
TARGET_CPUARCH?= ${TARGET_ARCH}
|
||||
.endif
|
||||
CROSSENV= TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
|
||||
CROSSMAKE= ${MAKE} ${CROSSENV}
|
||||
@ -194,7 +196,7 @@ DIST_DOCS_ARCH_DEP=
|
||||
#
|
||||
OTHER_DISTS?= catpages manpages games proflibs dict info doc ${ARCH_DISTS}
|
||||
BASE_DISTS?= base
|
||||
.if ${TARGET_ARCH} == "amd64"
|
||||
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
|
||||
ARCH_DISTS?= lib32
|
||||
.endif
|
||||
DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS}
|
||||
@ -274,6 +276,12 @@ MFSSIZE= 4096
|
||||
MFSINODE= 8192
|
||||
MFSLABEL= auto
|
||||
SEPARATE_LIVEFS=
|
||||
.elif ${TARGET_ARCH} == "powerpc64"
|
||||
DISKLABEL= ""
|
||||
MFSSIZE= 8192
|
||||
MFSINODE= 8192
|
||||
MFSLABEL= auto
|
||||
SEPARATE_LIVEFS=
|
||||
.endif
|
||||
.if defined(NO_FLOPPIES)
|
||||
.undef MAKE_FLOPPIES
|
||||
@ -550,6 +558,7 @@ release rerelease:
|
||||
SEPARATE_LIVEFS \
|
||||
TARGET \
|
||||
TARGET_ARCH \
|
||||
TARGET_CPUARCH \
|
||||
WORLD_FLAGS
|
||||
.if defined(${var})
|
||||
echo "export ${var}=\"${${var}}\"" >> ${_MK}
|
||||
@ -829,7 +838,7 @@ release.8:
|
||||
-test -f ${.CURDIR}/install.cfg \
|
||||
&& cp ${.CURDIR}/install.cfg ${RD}/mfsfd
|
||||
@mkdir -p ${RD}/mfsfd/boot
|
||||
.if ${TARGET_ARCH} != "ia64" && ${TARGET_ARCH} != "powerpc"
|
||||
.if ${TARGET_ARCH} != "ia64" && ${TARGET_CPUARCH} != "powerpc"
|
||||
@cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
|
||||
.endif
|
||||
.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
|
||||
@ -1129,35 +1138,35 @@ CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1
|
||||
.endif
|
||||
|
||||
iso.1:
|
||||
.if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh)
|
||||
.if exists(${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh)
|
||||
@echo "Creating ISO images..."
|
||||
.if defined(CD_BOOT)
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
FreeBSD_bootonly \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT}
|
||||
.endif
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
FreeBSD_Install \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \
|
||||
${CD_DISC1_PKGS}
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh \
|
||||
FreeBSD_Packages \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
|
||||
${CD_DISC2_PKGS}
|
||||
.if defined(MAKE_DVD)
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
FreeBSD_Install \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
|
||||
${CD_DVD1_PKGS}
|
||||
.endif
|
||||
.if !defined(NODOC)
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh \
|
||||
FreeBSD_Documentation \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \
|
||||
${CD_DOCS_PKGS}
|
||||
.endif
|
||||
.if defined(SEPARATE_LIVEFS)
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
@sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
FreeBSD_LiveFS \
|
||||
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS}
|
||||
.endif
|
||||
@ -1166,7 +1175,7 @@ iso.1:
|
||||
@(cd ${CD} && sha256 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256)
|
||||
touch ${.TARGET}
|
||||
.else
|
||||
@echo "Do not know how to create an ISO for ${TARGET_ARCH}."
|
||||
@echo "Do not know how to create an ISO for ${TARGET_CPUARCH}."
|
||||
.endif
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user