Module Name: src
Committed By: christos
Date: Sat Feb 17 15:07:04 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
src/distrib/utils/embedded/conf: arm64.conf arm64mbr.conf
Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/evbarm/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/arm64.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/arm64mbr.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.21
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20 Mon Nov 16 06:38:29 2020
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Sat Feb 17 10:07:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
+# $NetBSD: Makefile,v 1.21 2024/02/17 15:07:04 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -34,6 +34,10 @@ UBOOT_IMAGE_ARCH= arm64
UBOOT_IMAGE_ARCH= arm
.endif
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS= -t "${MKREPRO_TIMESTAMP}"
+.endif
+
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
@@ -50,7 +54,7 @@ release: ${IMAGE}
${INSTALL} -d -m 755 ${RAMDISKDIR}
${RELEASE_INSTALL} ${IMAGE} ${RAMDISKDIR}
${TOOL_MKUBOOTIMAGE} -A ${UBOOT_IMAGE_ARCH} -C none -O linux \
- -T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" ${IMAGE} \
- ${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
+ -T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" \
+ ${MKUBOOTIMAGEARGS} ${IMAGE} ${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
.include <bsd.prog.mk>
Index: src/distrib/utils/embedded/conf/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.15 src/distrib/utils/embedded/conf/arm64.conf:1.16
--- src/distrib/utils/embedded/conf/arm64.conf:1.15 Sat Oct 15 14:32:30 2022
+++ src/distrib/utils/embedded/conf/arm64.conf Sat Feb 17 10:07:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.15 2022/10/15 18:32:30 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.16 2024/02/17 15:07:03 christos Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -51,7 +51,7 @@ populate_common() {
cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
# Install kernel to root of the FFS partition
- ${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+ ${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
echo "./netbsd type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
}
@@ -102,7 +102,7 @@ populate() {
echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
case "${k}" in
*.gz)
- ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+ ${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
;;
*)
cp "${k}" "${mnt}/boot/${tgt}"
Index: src/distrib/utils/embedded/conf/arm64mbr.conf
diff -u src/distrib/utils/embedded/conf/arm64mbr.conf:1.2 src/distrib/utils/embedded/conf/arm64mbr.conf:1.3
--- src/distrib/utils/embedded/conf/arm64mbr.conf:1.2 Thu Jul 1 13:31:21 2021
+++ src/distrib/utils/embedded/conf/arm64mbr.conf Sat Feb 17 10:07:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: arm64mbr.conf,v 1.2 2021/07/01 17:31:21 jmcneill Exp $
+# $NetBSD: arm64mbr.conf,v 1.3 2024/02/17 15:07:03 christos Exp $
# ARM64 (MBR partitioning) customization script used by mkimage
#
board=arm64mbr
@@ -36,7 +36,7 @@ populate_common() {
cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
# Install kernel to root of the FFS partition
- ${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+ ${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
echo "./netbsd type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
}
@@ -87,7 +87,7 @@ populate() {
echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
case "${k}" in
*.gz)
- ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+ ${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
;;
*)
cp "${k}" "${mnt}/boot/${tgt}"
