Module Name: src
Committed By: tsutsui
Date: Mon Apr 29 07:13:42 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
Log Message:
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.10 src/sys/arch/hp300/stand/inst/Makefile:1.11
--- src/sys/arch/hp300/stand/inst/Makefile:1.10 Mon Sep 23 13:42:36 2019
+++ src/sys/arch/hp300/stand/inst/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -6,16 +6,14 @@ NEWVERSWHAT= "Miniroot Installer"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
- inst.lif ${DESTDIR}${BINDIR}/inst.lif
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
- ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-release: check_RELEASEDIR .WAIT inst.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.10 src/sys/arch/hp300/stand/uboot/Makefile:1.11
--- src/sys/arch/hp300/stand/uboot/Makefile:1.10 Sun Dec 11 07:41:37 2022
+++ src/sys/arch/hp300/stand/uboot/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/12/11 07:41:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -7,28 +7,20 @@ NEWVERSWHAT= "Primary Boot"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
CPPFLAGS+= -DSUPPORT_UFS2
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
- uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
- rm -f ${DESTDIR}${BINDIR}/rdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
- rm -f ${DESTDIR}${BINDIR}/bootrd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootrd
- rm -f ${DESTDIR}${BINDIR}/sdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/sdboot
- rm -f ${DESTDIR}${BINDIR}/bootsd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootsd
- rm -f ${DESTDIR}${BINDIR}/ctboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/ctboot
- rm -f ${DESTDIR}${BINDIR}/bootct
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootct
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-release: check_RELEASEDIR .WAIT uboot.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
