Module Name: src
Committed By: hubertf
Date: Sun Apr 19 18:28:31 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf
usermode.conf
Log Message:
Cleanup: make_filesystems is not used any longer, purge remains
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/usermode.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/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.1 src/distrib/utils/embedded/conf/armv7.conf:1.2
--- src/distrib/utils/embedded/conf/armv7.conf:1.1 Thu Apr 9 10:55:23 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.1 2015/04/09 10:55:23 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.2 2015/04/19 18:28:31 hubertf Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -11,10 +11,6 @@ kernels_awin="BPI CUBIEBOARD CUBIETRUCK
kernels_rpi="RPI2"
kernels_amlogic="ODROID-C1"
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_label() {
make_label_evbarm
}
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.28 src/distrib/utils/embedded/conf/rpi.conf:1.29
--- src/distrib/utils/embedded/conf/rpi.conf:1.28 Mon Apr 6 20:19:28 2015
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.28 2015/04/06 20:19:28 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.29 2015/04/19 18:28:31 hubertf Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -11,10 +11,6 @@ resize=true
firmwaredir=$src/external/broadcom/rpi-firmware/dist
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_fstab() {
make_fstab_evbarm
}
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.6 src/distrib/utils/embedded/conf/rpi_inst.conf:1.7
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.6 Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.6 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -75,10 +75,6 @@ customize_evbarm() {
firmwaredir=$src/external/broadcom/rpi-firmware/dist
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_fstab() {
make_fstab_evbarm
}
Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u src/distrib/utils/embedded/conf/usermode.conf:1.4 src/distrib/utils/embedded/conf/usermode.conf:1.5
--- src/distrib/utils/embedded/conf/usermode.conf:1.4 Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/usermode.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.4 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: usermode.conf,v 1.5 2015/04/19 18:28:31 hubertf Exp $
# NetBSD/usermode customization script used by mkimage
# XXX: BROKEN, needs to be converted to makefs
@@ -10,11 +10,6 @@ setsdir=/usr/build/release/$(uname -m)/b
size=0 # in MB
usermodedirs="/var.cow /etc.cow /root.cow /pkgs"
-make_filesystems() {
- newfs /dev/r${vnddev}a
- mount /dev/${vnddev}a ${mnt}
-}
-
make_fstab() {
cat > ${mnt}/etc/fstab << EOF
# NetBSD/usermode /etc/fstab
