svn commit: r184541 - in user/edwin/releasenotes/stable-6/release:
. doc/en_US.ISO8859-1/hardware/amd64 scripts
Edwin Groothuis
edwin at FreeBSD.org
Sat Nov 1 16:39:21 PDT 2008
Author: edwin
Date: Sat Nov 1 23:39:21 2008
New Revision: 184541
URL: http://svn.freebsd.org/changeset/base/184541
Log:
MFS
Modified:
user/edwin/releasenotes/stable-6/release/ (props changed)
user/edwin/releasenotes/stable-6/release/Makefile
user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
user/edwin/releasenotes/stable-6/release/scripts/package-split.py
user/edwin/releasenotes/stable-6/release/scripts/src-install.sh (props changed)
Modified: user/edwin/releasenotes/stable-6/release/Makefile
==============================================================================
--- user/edwin/releasenotes/stable-6/release/Makefile Sat Nov 1 23:05:49 2008 (r184540)
+++ user/edwin/releasenotes/stable-6/release/Makefile Sat Nov 1 23:39:21 2008 (r184541)
@@ -192,6 +192,7 @@ MNT= /mnt
.undef MAKE_FLOPPIES
.if ${TARGET_ARCH} == "i386"
MAKE_FLOPPIES= true
+MAKE_DVD=
.if ${TARGET} == "pc98"
SMALLFLOPPYSIZE= 1200
SMALLFLOPPYSPLITSIZE= 1152
@@ -230,6 +231,7 @@ MFSLABEL= auto
SEPARATE_LIVEFS=
.elif ${TARGET_ARCH} == "amd64"
MAKE_FLOPPIES= true
+MAKE_DVD=
FLOPPYSIZE= 1440
FLOPPYSPLITSIZE= 1392
FLOPPYINODE= 40000
@@ -269,6 +271,9 @@ CD_BOOT= ${CD}/bootonly
CD_DISC1= ${CD}/disc1
CD_DISC2= ${CD}/disc2
CD_DISC3= ${CD}/disc3
+.if defined(MAKE_DVD)
+CD_DVD1= ${CD}/dvd1
+.endif
.if !defined(NODOC)
CD_DOCS= ${CD}/docs
.endif
@@ -488,6 +493,7 @@ release rerelease:
KERNELS \
KERNELS_BASE \
KERNEL_FLAGS \
+ MAKE_DVD \
MAKE_FLOPPIES \
MAKE_ISOS \
NOCDROM \
@@ -941,6 +947,18 @@ cdrom.1:
find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \
fi \
done
+.if defined(MAKE_DVD)
+ @echo "Building DVD filesystem image as well as CDROM"
+ @mkdir -p ${CD_DVD1}/${BUILDNAME}
+ @for i in ${DISTRIBUTIONS} ; \
+ do \
+ if [ -d ${RD}/trees/$${i} ] ; then \
+ chflags -R noschg ${RD}/trees/$${i} || true ; \
+ ( cd ${RD}/trees/$${i} && \
+ find . -depth -print | cpio -dumpl ${CD_DVD1} ) ; \
+ fi \
+ done
+.endif
@echo "Copy GENERIC kernel to boot area"
@cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel
@rm -f ${CD_LIVEFS}/.profile
@@ -958,6 +976,23 @@ cdrom.1:
@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
.endif
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
+.if defined(MAKE_DVD)
+ @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
+ @rm -f ${CD_DVD1}/boot/kernel/*.symbols
+ @rm -f ${CD_DVD1}/.profile
+ @cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
+ @ln -sf /rescue ${CD_DVD1}/stand
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+ @rm -f ${CD_DVD1}/boot/loader.conf
+ @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
+ @echo 'mfsroot_load="YES"' > ${CD_DVD1}/boot/loader.conf
+ @echo 'mfsroot_type="mfs_root"' >> ${CD_DVD1}/boot/loader.conf
+ @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD1}/boot/loader.conf
+.if exists(${RD}/trees/base/boot/device.hints)
+ @rm -f ${CD_DVD1}/boot/device.hints
+ @cp ${RD}/trees/base/boot/device.hints ${CD_DVD1}/boot/device.hints
+.endif
+.endif
touch ${.TARGET}
# Build disc1, disc2 and disc3 cdrom images
@@ -998,11 +1033,37 @@ cdrom.2:
@mkdir -p ${CD_DISC3}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC3}/cdrom.inf
@echo "CD_VOLUME = 3" >> ${CD_DISC3}/cdrom.inf
+.if defined(MAKE_DVD)
+.if defined(MAKE_FLOPPIES)
+ @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD1}
+.endif
+ @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD1}/${BUILDNAME}
+.if !defined(NODOC)
+ @for i in ${DIST_DOCS_ARCH_INDEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ cp ${RND}/${RELNOTES_LANG}/$$i/article.html \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+ done
+ @for i in ${DIST_DOCS_ARCH_DEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \
+ ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+ done
+ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD1}
+.endif
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+ @echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
+.endif
.if !defined(NODOC)
@echo "Building CDROM docs filesystem image"
@mkdir -p ${CD_DOCS}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
@mkdir -p ${CD_DOCS}/usr/share/doc
+.if defined(MAKE_DVD)
+ @mkdir -p ${CD_DVD1}/usr/share/doc
+.endif
@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
-d /usr/doc/$$i ]; then \
@@ -1010,6 +1071,10 @@ cdrom.2:
${CD_DOCS}/usr/share/doc; \
fi \
done
+.if defined(MAKE_DVD)
+ @cd ${CD_DOCS}/usr/share/doc && find . -print | \
+ cpio -dumpl ${CD_DVD1}/usr/share/doc
+.endif
.endif
touch ${.TARGET}
@@ -1043,6 +1108,9 @@ CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2
.if exists(${CD_PACKAGE_TREE}/disc3)
CD_DISC3_PKGS= ${CD_PACKAGE_TREE}/disc3
.endif
+.if exists(${CD_PACKAGE_TREE}/dvd1)
+CD_DVD_PKGS= ${CD_PACKAGE_TREE}/dvd1
+.endif
.endif
.endif
@@ -1066,6 +1134,12 @@ iso.1:
FreeBSD_Packages_2 \
${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DISC3} \
${CD_DISC3_PKGS}
+.if defined(MAKE_DVD)
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
+ FreeBSD_Install \
+ ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
+ ${CD_DVD1_PKGS}
+.endif
.if !defined(NODOC)
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
FreeBSD_Documentation \
Modified: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml
==============================================================================
--- user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml Sat Nov 1 23:05:49 2008 (r184540)
+++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml Sat Nov 1 23:39:21 2008 (r184541)
@@ -29,7 +29,7 @@
</listitem>
<listitem>
- <para>Intel 64-bit Xeon (<quote>Nacona</quote>).
+ <para>Intel 64-bit Xeon (<quote>Nocona</quote>).
This processor is fabricated on 90nm process technology, and operates
with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets.</para>
</listitem>
Modified: user/edwin/releasenotes/stable-6/release/scripts/package-split.py
==============================================================================
--- user/edwin/releasenotes/stable-6/release/scripts/package-split.py Sat Nov 1 23:05:49 2008 (r184540)
+++ user/edwin/releasenotes/stable-6/release/scripts/package-split.py Sat Nov 1 23:39:21 2008 (r184541)
@@ -26,13 +26,12 @@ else:
# List of packages for disc1. This just includes packages sysinstall can
# install as a distribution
def disc1_packages():
- pkgs = ['lang/perl5.8']
- pkgs.extend(['x11/xorg',
- 'x11-drivers/xorg-drivers',
- 'x11-fonts/xorg-fonts',
- 'x11-servers/xorg-nestserver',
- 'x11-servers/xorg-vfbserver',
- 'devel/imake'])
+ pkgs = ['archivers/unzip',
+ 'emulators/mtools',
+ 'lang/perl5.8',
+ 'misc/compat5x',
+ 'net/cvsup-without-gui',
+ 'net/rsync']
if arch == 'alpha':
pkgs.append('emulators/osf1_base')
elif arch == 'i386':
@@ -49,42 +48,45 @@ def disc2_packages():
'x11/kde-lite']
else:
pkgs = ['x11/gnome2',
- 'x11/kde3']
+ 'x11/kdebase3',
+ 'x11/kdelibs3']
+ pkgs.extend(['x11/xorg',
+ 'x11-drivers/xorg-drivers',
+ 'x11-fonts/xorg-fonts',
+ 'x11-servers/xorg-nestserver',
+ 'x11-servers/xorg-vfbserver',
+ 'devel/imake'])
return pkgs
def disc3_packages():
- pkgs = ['x11-wm/afterstep',
+ pkgs = ['x11/kde3',
+ 'x11-wm/afterstep',
'x11-wm/windowmaker',
'x11-wm/fvwm2',
# "Nice to have"
- 'archivers/unzip',
'astro/xearth',
'devel/gmake',
'editors/emacs',
'editors/vim-lite',
'editors/xemacs',
- 'emulators/mtools',
'graphics/png',
'graphics/xv',
'irc/xchat',
'lang/php5',
+ 'mail/alpine',
'mail/exim',
'mail/fetchmail',
'mail/mutt',
- 'mail/pine4',
'mail/popd',
'mail/xfmail',
'mail/postfix',
- 'misc/compat5x',
- 'net/cvsup-without-gui',
- 'net/rsync',
'net/samba3',
'news/slrn',
'news/tin',
'ports-mgmt/portupgrade',
'print/a2ps-letter',
'print/apsfilter',
- 'print/ghostscript-gnu-nox11',
+ 'print/ghostscript7-nox11',
'print/gv',
'print/psutils-letter',
'print/teTeX',
More information about the svn-src-user
mailing list