Date: Wed, 2 May 2001 22:00:37 +0000 (GMT) From: Terry Lambert <tlambert@primenet.com> To: current@freebsd.org Subject: PATCH: partial fix for broken "make release"... Message-ID: <200105022200.PAA25967@usr01.primenet.com>
next in thread | raw e-mail | index | archive | help
The "make release" stuff is broken, at least in 4.3, and possibly
before that.
There are several obviously broken things:
o The libssh stuff is not installed, and it is not built
during a "make release"; I don't know why that is; the
workaround is to wait for it to bomb out, and then
manuall copy /usr/obj/usr/src/secure/lib/libssh/lib*.a
into your ${CHROOTDIR}/usr/obj, and do a "make rerelease"
to restart things (without this, the pam_ssh module
build fails).
o The files jade_1.2.1-13.diff.gz and pdf_sec.ps are not
available from any of the listed mirros in the "ports"
hierarchy, so they can not be correctly installed, and
a "doc" build can not complete. The workaround is to
let the above fail, and then:
cd ${CHROOT}/usr/ports/distfiles
GOTO=ftp://sunsite.doc.ic.ac.uk/Mirrors/FreeBSD/ports/distfiles"
fetch ${GOTO}/jade_1.2.1-13.diff.gc
fetch ${GOTO}/pdf_sec.ps
Then restart again... but this time:
make rerelease RELEASENOUPDATE=Y ...
o If you set KERNCONF to a non-default value ("GENERIC" is
the default value), then sysinstall can't find it to
install it during the installation process; the attached
patch works for RELENG_4, and would have to be reflected
into /usr/src/release AND /usr/src/usr.sbin/sysinstall
for -current.
Can someone at least apply the patch to RELENG_4???
Terry Lambert
terry@lambert.org
---
Any opinions in this posting are my own and not those of my present
or previous employers.
Index: Makefile
===================================================================
RCS file: /home/cvs/FreeBSD/src/release/Makefile,v
retrieving revision 1.536.2.41
diff -u -r1.536.2.41 Makefile
--- Makefile 2001/04/14 22:29:49 1.536.2.41
+++ Makefile 2001/05/02 22:04:14
@@ -268,6 +268,7 @@
echo "#!/bin/sh" > ${CHROOTDIR}/mk
echo "set -ex" >> ${CHROOTDIR}/mk
echo "_RELTARGET=\$${1:-doRELEASE}" >> ${CHROOTDIR}/mk
+ echo "export KERNCONF=${KERNCONF}" >> ${CHROOTDIR}/mk
echo "export CFLAGS='-O -pipe'" >> ${CHROOTDIR}/mk
echo "export NO_X=YES" >> ${CHROOTDIR}/mk
echo "export DISTRIBUTIONS=\"${DISTRIBUTIONS}\"" >> ${CHROOTDIR}/mk
Index: sysinstall/Makefile
===================================================================
RCS file: /home/cvs/FreeBSD/src/release/sysinstall/Attic/Makefile,v
retrieving revision 1.92.2.10
diff -u -r1.92.2.10 Makefile
--- sysinstall/Makefile 2001/03/12 12:10:28 1.92.2.10
+++ sysinstall/Makefile 2001/05/02 22:06:52
@@ -17,7 +17,7 @@
system.c tape.c tcpip.c termcap.c ufs.c usb.c user.c variable.c \
wizard.c keymap.h
-CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
+CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -DKERNCONF=\"${KERNCONF}\"
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
Index: sysinstall/install.c
===================================================================
RCS file: /home/cvs/FreeBSD/src/release/sysinstall/Attic/install.c,v
retrieving revision 1.268.2.22
diff -u -r1.268.2.22 install.c
--- sysinstall/install.c 2001/03/12 22:50:04 1.268.2.22
+++ sysinstall/install.c 2001/05/02 22:20:06
@@ -750,7 +750,11 @@
if (RunningAsInit) {
/* Fix up kernel first */
if (!file_readable("/kernel")) {
+#ifdef KERNCONF
+ char *generic_kernel = "/kernel." KERNCONF;
+#else
char *generic_kernel = "/kernel.GENERIC";
+#endif
if (file_readable(generic_kernel)) {
if (vsystem("cp -p %s /kernel", generic_kernel)) {
msgConfirm("Unable to copy /kernel into place!");
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105022200.PAA25967>