Attachment 155127 Details for Bug 183765 – remove menu.rc and loader.rc install guards

[patch] remove menu.rc and loader.rc install guards

loader-no-rc-guards.diff (text/plain), 3.84 KB, created by Nikolai Lifanov on 2015-04-02 18:19:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2015-04-02 18:19:17 UTC

Size: 3.84 KB

patch

obsolete

>Index: i386/loader/Makefile
>===================================================================
>--- i386/loader/Makefile	(revision 280991)
>+++ i386/loader/Makefile	(working copy)
>@@ -112,14 +112,8 @@
> FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILES+= pcibios.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+=	loader.rc
>-.endif
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
>-.endif
> 
> # XXX crt0.o needs to be first for pxeboot(8) to work
> OBJS=	${BTXCRT}
>Index: mips/beri/loader/Makefile
>===================================================================
>--- mips/beri/loader/Makefile	(revision 280991)
>+++ mips/beri/loader/Makefile	(working copy)
>@@ -127,14 +127,8 @@
> FILES+=	beastie.4th brand.4th check-password.4th color.4th delay.4th
> FILES+=	menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+= loader.rc
>-.endif
>-
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> .if defined(LOADER_USB_SUPPORT)
> # Do garbage collection
>Index: pc98/loader/Makefile
>===================================================================
>--- pc98/loader/Makefile	(revision 280991)
>+++ pc98/loader/Makefile	(working copy)
>@@ -92,13 +92,8 @@
> FILES+= brand.4th check-password.4th color.4th delay.4th
> FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+=	${.CURDIR}/../../i386/loader/loader.rc
>-.endif
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> # XXX crt0.o needs to be first for pxeboot(8) to work
> OBJS=	${BTXCRT}
>Index: powerpc/kboot/Makefile
>===================================================================
>--- powerpc/kboot/Makefile	(revision 280991)
>+++ powerpc/kboot/Makefile	(working copy)
>@@ -119,13 +119,7 @@
> FILES+=	beastie.4th brand.4th check-password.4th color.4th delay.4th
> FILES+=	menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+= loader.rc
>-.endif
>-
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> .include <bsd.prog.mk>
>Index: powerpc/ofw/Makefile
>===================================================================
>--- powerpc/ofw/Makefile	(revision 280991)
>+++ powerpc/ofw/Makefile	(working copy)
>@@ -114,13 +114,7 @@
> FILES+=	beastie.4th brand.4th check-password.4th color.4th delay.4th
> FILES+=	menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+= loader.rc
>-.endif
>-
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> .include <bsd.prog.mk>
>Index: powerpc/ps3/Makefile
>===================================================================
>--- powerpc/ps3/Makefile	(revision 280991)
>+++ powerpc/ps3/Makefile	(working copy)
>@@ -116,13 +116,7 @@
> FILES+=	beastie.4th brand.4th check-password.4th color.4th delay.4th
> FILES+=	menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+= loader.rc
>-.endif
>-
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> .include <bsd.prog.mk>
>Index: sparc64/loader/Makefile
>===================================================================
>--- sparc64/loader/Makefile	(revision 280991)
>+++ sparc64/loader/Makefile	(working copy)
>@@ -101,13 +101,7 @@
> FILES+=	beastie.4th brand.4th check-password.4th color.4th delay.4th
> FILES+=	menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
> FILESDIR_loader.conf=	/boot/defaults
>-
>-.if !exists(${DESTDIR}/boot/loader.rc)
> FILES+= loader.rc
>-.endif
>-
>-.if !exists(${DESTDIR}/boot/menu.rc)
> FILES+= menu.rc
>-.endif
> 
> .include <bsd.prog.mk>

Actions: View | Diff

Attachments on bug 183765: 155127 | 159122